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

Reworked ssmtp integration, need to use fastcgi_param PHP_ADMIN_VALUE "sendmail_path=/usr/sbin/sendmail -i -t"; in nginx config, and hostname: for php container

Browse Source
This commit is contained in:
Deon George 2018-02-27 19:55:11 +11:00
parent 99791da0ec
commit 5bf33b84ee
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -6,18 +6,17 @@ stages:
variables: variables:
BRANCH: plus BRANCH: plus
VERSION: 7.1-fpm-${BRANCH} VERSION: 7.2-fpm-${BRANCH}
CACHETAG: build-${BRANCH} CACHETAG: build-${BRANCH}
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
@ -32,6 +31,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}

4
Dockerfile
View File

@ -1,7 +1,7 @@
# NAME leenooks/php # NAME leenooks/php
# VERSION 7.1-fpm-plus # VERSION 7.2-fpm-plus
FROM registry.leenooks.net/leenooks/php:7.1-fpm-mysql FROM registry.leenooks.net/leenooks/php:7.2-fpm-mysql
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y libbz2-dev libgmp-dev libpng-dev libjpeg-dev libfreetype6-dev libmagickwand-dev --no-install-recommends \ && apt-get install -y libbz2-dev libgmp-dev libpng-dev libjpeg-dev libfreetype6-dev libmagickwand-dev --no-install-recommends \

28
sshd_config.patch
View File

@ -1,20 +1,18 @@
--- /etc/ssh/sshd_config.orig 2017-12-13 10:12:21.098005827 +0000 --- /etc/ssh/sshd_config.orig 2018-02-27 08:33:29.613104521 +0000
+++ /etc/ssh/sshd_config 2017-12-13 10:14:11.461687661 +0000 +++ /etc/ssh/sshd_config 2018-02-27 08:34:43.413485512 +0000
@@ -25,7 +25,7 @@ @@ -30,6 +30,7 @@
# Authentication: #LoginGraceTime 2m
LoginGraceTime 120 #PermitRootLogin prohibit-password
-PermitRootLogin without-password
+PermitRootLogin no +PermitRootLogin no
StrictModes yes #StrictModes yes
#MaxAuthTries 6
#MaxSessions 10
@@ -54,6 +55,7 @@
RSAAuthentication yes # To disable tunneled clear text passwords, change to no here!
@@ -49,7 +49,7 @@ #PasswordAuthentication yes
ChallengeResponseAuthentication no
# Change to no to disable tunnelled clear text passwords
-#PasswordAuthentication yes
+PasswordAuthentication no +PasswordAuthentication no
#PermitEmptyPasswords no
# Kerberos options # Change to yes to enable challenge-response passwords (beware issues with
#KerberosAuthentication no