diff --git a/Dockerfile b/Dockerfile index c7fa51f..e206fda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:rawhide +FROM registry.fedoraproject.org/fedora:26 # memcached image for OpenShift. # @@ -12,10 +12,10 @@ LABEL MAINTAINER "Petr Hracek" LABEL summary="High Performance, Distributed Memory Object Cache" \ name="$FGC/$NAME" \ version="0" \ - release="3.$DISTTAG" \ + release="2.$DISTTAG" \ architecture="$ARCH" \ com.redhat.component=$NAME \ - usage="docker run -p 11211:11211 registry.fedoraproject.org/rawhide/memcached" \ + usage="docker run -p 11211:11211 registry.fedoraproject.org/f26/memcached" \ help="Runs memcached, which listens on port 11211. No dependencies. See Help File below for more details." \ description="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load." \ io.k8s.description="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load." \ @@ -23,11 +23,12 @@ LABEL summary="High Performance, Distributed Memory Object Cache" \ io.openshift.expose-services="11211:memcached" \ io.openshift.tags="memcached" -RUN dnf -y --nodocs install memcached && \ +RUN dnf install -y --setopt=tsflags=nodocs memcached && \ dnf -y clean all + ADD files /files -ADD root/help.1 /help.1 +ADD help.md README.md / EXPOSE 11211 diff --git a/README.md b/README.md index 2182789..c112c86 100644 --- a/README.md +++ b/README.md @@ -7,20 +7,20 @@ Memcached is High Performance, Distributed Memory Object Cache Pull the image from Docker Hub: ```bash -$ sudo docker pull registry.fedoraproject.org/memcached:rawhide +$ sudo docker pull registry.fedoraproject.org/f26/memcached ``` Run the container ```bash -docker run -it -p 11211:11211 --name memcached modularitycontainers/memcached +docker run -it -p 11211:11211 --name memcached registry.fedoraproject.org/f26/memcached ``` If you would like to debug memcached, use container option =e MEMCACHED_DEBUG_MODE: ```bash docker run -it -p 11211:11211 [-e MEMCACHED_DEBUG_MODE] ---name memcached modularitycontainers/memcached +--name memcached registry.fedoraproject.org/f26/memcached ``` If you would like to change memcached options, like cache_size, connections or threads, use environment variable -e MEMCACHED_CACHE_SIZE, -e MEMCACHED_CONNECTIONS, -e MEMCACHED_THREADS respectively: @@ -29,7 +29,7 @@ docker run -it -p 11211:11211 [-e MEMCACHED_CACHE_SIZE=] [-e MEMCACHED_CONNECTIONS=] [-e MEMCACHED_THREADS=] ---name memcached modularitycontainers/memcached +--name memcached registry.fedoraproject.org/f26/memcached ``` ## A demo diff --git a/help.md b/help.md index 8569dde..a837244 100644 --- a/help.md +++ b/help.md @@ -9,7 +9,7 @@ memcached - High Performance, Distributed Memory Object Cache. Memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load. The container itself consists of: - - fedora/rawhide base image + - fedora/f26 base image - memcached RPM package Files added to the container during docker build include: /files/memcached.sh @@ -17,7 +17,7 @@ Files added to the container during docker build include: /files/memcached.sh # USAGE To get the memcached container image on your local system, run the following: - docker pull registry.fedoraproject.org/memcached:rawhide + docker pull registry.fedoraproject.org/f26/memcached # ENVIRONMENT VARIABLES diff --git a/root/help.1 b/root/help.1 deleted file mode 100644 index 4056147..0000000 --- a/root/help.1 +++ /dev/null @@ -1,60 +0,0 @@ -.TH "MEMCACHED" "1" " Container Image Pages" "Petr Hracek" "February 6, 2017" -.nh -.ad l - - -.SH NAME -.PP -memcached \- High Performance, Distributed Memory Object Cache. - - -.SH DESCRIPTION -.PP -Memcached is a high\-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load. - -.PP -The container itself consists of: - \- fedora/24 base image - \- memcached RPM package - -.PP -Files added to the container during docker build include: /files/memcached.sh - - -.SH USAGE -.PP -To get the memcached container image on your local system, run the following: - -.PP -.RS - -.nf -docker pull hub.docker.io/phracek/memcached - -.fi -.RE - - -.SH ENVIRONMENT VARIABLES -.PP -The memcached container includes the following environment variables: - -.PP -CACHE\_SIZE=128 - The variable sets size of cached used by memcached. - - -.SH SECURITY IMPLICATIONS -.PP -Lists of security\-related attributes that are opened to the host. - -.PP -\-p 11211:11211 - Opens container port 11211 and maps it to the same port on the host. - - -.SH SEE ALSO -.PP -Memcached page - -\[la]https://memcached.org/\[ra]