docker/wordpress
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated to 4.9.2-fpm

Browse Source
This commit is contained in:
Deon George 2018-02-02 21:14:10 +11:00
parent dd62e77524
commit e3087514ea
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -7,16 +7,15 @@ stages:
variables: variables:
VERSION: 4.9.1-fpm VERSION: 4.9.1-fpm
CACHETAG: build CACHETAG: build
DOCKER_REGISTRY: registry.leenooks.net DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375
DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
services: services:
- ${DOCKER_REGISTRY}/leenooks/ci-docker:dind - ${CI_REGISTRY}/leenooks/ci-docker:dind
before_script: before_script:
- docker info - docker info
- docker version - docker version
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN ${DOCKER_REGISTRY} - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
test: test:
stage: test stage: test
@ -31,6 +30,7 @@ test:
build: build:
stage: build stage: build
script: script:
- if [ -f init ]; then chmod 500 init; fi
- docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
- docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} . - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
- docker push ${CI_REGISTRY_IMAGE}:${VERSION} - docker push ${CI_REGISTRY_IMAGE}:${VERSION}

11
Dockerfile
View File

@ -1,14 +1,17 @@
# NAME leenooks/wordpress # NAME leenooks/wordpress
# VERSION 4.9.1-fpm # VERSION 4.9.2-fpm
FROM wordpress:4.9.1-fpm FROM wordpress:4.9.2-fpm
RUN apt-get update && apt-get install -y openssh-server && useradd -c "Hosting Admin User" -u 1000 -g users -G www-data -d /var/www/html -M lamp RUN apt-get update \
EXPOSE 9000/tcp 22/tcp && apt-get install -y openssh-server \
&& useradd -c "Hosting Admin User" -u 1000 -g users -G www-data -d /var/www/html -M lamp
COPY sshd_config.patch /tmp COPY sshd_config.patch /tmp
RUN (cd / && patch -p0 ) < /tmp/sshd_config.patch && rm /tmp/sshd_config.patch RUN (cd / && patch -p0 ) < /tmp/sshd_config.patch && rm /tmp/sshd_config.patch
EXPOSE 9000/tcp 22/tcp
COPY start /usr/local/sbin COPY start /usr/local/sbin
ENTRYPOINT [ "/usr/local/sbin/start" ] ENTRYPOINT [ "/usr/local/sbin/start" ]
CMD [ "php-fpm" ] CMD [ "php-fpm" ]

2
start
View File

@ -5,4 +5,4 @@ if [ -x /usr/sbin/sshd -a "${SSH_START}" = "TRUE" ]; then
start-stop-daemon --start --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- -p 22 start-stop-daemon --start --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- -p 22
fi fi
exec /usr/local/bin/docker-php-entrypoint "$@" exec /usr/local/bin/docker-entrypoint.sh "$@"