Compare commits
17 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
972a4aeaf8 | ||
|
|
6cd2f36bbc | ||
|
|
7869fc6f50 | ||
|
|
88c1064ebd | ||
|
|
ab12261b81 | ||
|
|
ec8accdf4a | ||
|
|
8f38abdaa5 | ||
|
|
99dbe0d13d | ||
|
|
a20a865d55 | ||
|
|
34d0a7416c | ||
|
|
bc3a465c0f | ||
|
|
cd409b2002 | ||
|
|
b29603092e | ||
|
|
68c1281162 | ||
|
|
921575772f | ||
|
|
5bf33b84ee | ||
|
|
99791da0ec |
@ -6,18 +6,17 @@ stages:
|
|||||||
|
|
||||||
variables:
|
variables:
|
||||||
BRANCH: plus
|
BRANCH: plus
|
||||||
VERSION: 7.1-fpm-${BRANCH}
|
VERSION: 8.0-fpm-${BRANCH}
|
||||||
CACHETAG: build-${BRANCH}
|
CACHETAG: build-${BRANCH}
|
||||||
DOCKER_REGISTRY: registry.leenooks.net
|
DOCKER_HOST: tcp://docker:2375
|
||||||
DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
- ${DOCKER_REGISTRY}/leenooks/ci-docker:dind
|
- 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
|
||||||
@ -29,14 +28,17 @@ test:
|
|||||||
only:
|
only:
|
||||||
- debug
|
- debug
|
||||||
|
|
||||||
build:
|
x86_64:build:
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
|
- if [ -f init ]; then chmod 500 init; fi
|
||||||
|
- ([ -z "$REFRESH" ] && 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}
|
||||||
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
|
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
|
||||||
|
- apk add curl && curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=ext ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
|
- x86_64
|
||||||
only:
|
only:
|
||||||
- plus
|
- plus
|
||||||
|
|||||||
74
Dockerfile
74
Dockerfile
@ -1,23 +1,57 @@
|
|||||||
# NAME leenooks/php
|
# NAME leenooks/php
|
||||||
# VERSION 7.1-fpm-plus
|
# VERSION 8.0-fpm-plus
|
||||||
|
|
||||||
FROM php:7.1-fpm
|
FROM registry.leenooks.net/leenooks/php:8.0-fpm-mp
|
||||||
RUN echo "deb http://deb.debian.org/debian jessie non-free" >> /etc/apt/sources.list.d/non-free.list && apt-get update \
|
|
||||||
&& apt-get install -y pkg-config libbz2-dev libgmp-dev libpng-dev libjpeg-dev libfreetype6-dev libsnmp-dev snmp-mibs-downloader libmagickwand-dev --no-install-recommends \
|
RUN cd /usr/local/bin && curl -OsL https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions && chmod +x install-php-extensions
|
||||||
&& download-mibs \
|
|
||||||
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/freetype2 --with-jpeg-dir=/usr/include/ \
|
RUN mv /sbin/init /sbin/init.tmp \
|
||||||
&& docker-php-ext-install -j$(nproc) pdo_mysql bz2 gettext sockets gmp gd pcntl snmp exif \
|
&& sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list \
|
||||||
&& pecl install imagick && docker-php-ext-enable imagick \
|
&& cat /etc/apt/sources.list|grep ^deb | sed -E 's/^deb/deb-src/' >> /etc/apt/sources.list \
|
||||||
|
&& apt-get -y update \
|
||||||
|
&& apt-get -y install wget build-essential libtool git-core libwmf0.2-7 \
|
||||||
|
libpangocairo-1.0-0 libxt6 libjbig0 liblcms2-2 libtiff5 liblqr-1-0 libdjvulibre21 libfftw3-double3 libx265-165 \
|
||||||
|
libwebpmux3 libwebpdemux2 libopenexr23 libilmbase23 libopenjp2-7 \
|
||||||
|
&& apt-get -y build-dep imagemagick libmagickcore-dev libde265 libheif libfontconfig1 \
|
||||||
|
&& cd /usr/src/ \
|
||||||
|
&& git clone https://github.com/strukturag/libde265.git \
|
||||||
|
&& git clone https://github.com/strukturag/libheif.git \
|
||||||
|
&& cd libde265/ \
|
||||||
|
&& ./autogen.sh \
|
||||||
|
&& ./configure \
|
||||||
|
&& make \
|
||||||
|
&& make install \
|
||||||
|
&& cd /usr/src/libheif/ \
|
||||||
|
&& ./autogen.sh \
|
||||||
|
&& ./configure \
|
||||||
|
&& make \
|
||||||
|
&& make install \
|
||||||
|
&& mkdir /usr/src/ImageMagick \
|
||||||
|
&& git clone https://github.com/ImageMagick/ImageMagick.git ImageMagick-7.0.11 \
|
||||||
|
&& cd ImageMagick-7.0.11 \
|
||||||
|
&& ./configure --with-heic=yes --with-modules \
|
||||||
|
&& make install \
|
||||||
|
&& ldconfig \
|
||||||
|
&& apt-get install -y libbz2-dev libgmp-dev libpng-dev libjpeg-dev libfreetype6-dev --no-install-recommends \
|
||||||
|
&& docker-php-ext-configure gd --with-freetype=/usr/include/freetype2 --with-jpeg=/usr/include/ \
|
||||||
|
&& docker-php-ext-install -j$(nproc) bz2 sockets gmp gd pcntl exif \
|
||||||
|
&& install-php-extensions imagick \
|
||||||
|
&& apt-get purge -y build-essential libtool wget libbz2-dev libgmp-dev libpng-dev libjpeg-dev libfreetype6-dev \
|
||||||
|
hicolor-icon-theme texlive-base texlive-binaries libx11-dev automake autotools-dev bsdmainutils dbus-user-session dbus-user-session doxygen \
|
||||||
|
fonts-lmodern ghostscript graphviz fonts-dejavu-core gsfonts icu-devtools jdupes groff-base chrpath dbus dmsetup libavutil-dev libblkid-dev \
|
||||||
|
libde265-dev libdjvulibre-dev libexif-dev libfftw3-dev libheif-dev libilmbase-dev libjbig-dev libjpeg62-turbo-dev liblcms2-dev liblqr-1-0-dev \
|
||||||
|
libopenjp2-7-dev libperl-dev libtiff-dev libwebp-dev libx265-dev man-db zlib1g-dev python python3 xsltproc python2.7-minimal python3.7-minimal \
|
||||||
|
tex-common mime-support poppler-data preview-latex-style readline-common libgdk-pixbuf2.0-0 libgl1-mesa-dri libgtk-3-common libpaper1 libpulse0 \
|
||||||
|
libpython2.7-minimal libpython3.7-minimal libqt5core5a libqt5gui5 libsensors-config libvdpau1 shared-mime-info libglib2.0-data libxml2-utils ttf-bitstream-vera libgvc6 \
|
||||||
|
imagemagick-6-common \
|
||||||
|
&& apt-get autoremove -y \
|
||||||
|
&& rm -rf /var/lib/apt/lists/* /tmp/* \
|
||||||
|
&& rm -rf /usr/src/libde265 /usr/src/libheif /usr/src/ImageMagick \
|
||||||
|
&& mv /sbin/init.tmp /sbin/init
|
||||||
|
|
||||||
|
RUN apt-get -y update \
|
||||||
|
&& apt-get -y install build-essential libzip4 libzip-dev zlib1g-dev \
|
||||||
|
&& docker-php-ext-install -j$(nproc) zip \
|
||||||
|
&& apt-get purge -y build-essential libzip-dev zlib1g-dev \
|
||||||
|
&& apt-get autoremove -y \
|
||||||
&& rm -rf /var/lib/apt/lists/* /tmp/*
|
&& rm -rf /var/lib/apt/lists/* /tmp/*
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y openssh-server && rm -rf /var/lib/apt/lists/* \
|
|
||||||
&& useradd -c "Hosting Admin User" -u 1000 -g users -G www-data -d /var/www/html -M lamp
|
|
||||||
|
|
||||||
EXPOSE 9000/tcp 22/tcp
|
|
||||||
|
|
||||||
COPY sshd_config.patch /tmp
|
|
||||||
RUN (cd / && patch -p0 ) < /tmp/sshd_config.patch && rm /tmp/sshd_config.patch
|
|
||||||
|
|
||||||
COPY start /usr/local/sbin
|
|
||||||
ENTRYPOINT [ "/usr/local/sbin/start" ]
|
|
||||||
CMD ["php-fpm"]
|
|
||||||
|
|||||||
@ -1,20 +0,0 @@
|
|||||||
--- /etc/ssh/sshd_config.orig 2017-12-13 10:12:21.098005827 +0000
|
|
||||||
+++ /etc/ssh/sshd_config 2017-12-13 10:14:11.461687661 +0000
|
|
||||||
@@ -25,7 +25,7 @@
|
|
||||||
|
|
||||||
# Authentication:
|
|
||||||
LoginGraceTime 120
|
|
||||||
-PermitRootLogin without-password
|
|
||||||
+PermitRootLogin no
|
|
||||||
StrictModes yes
|
|
||||||
|
|
||||||
RSAAuthentication yes
|
|
||||||
@@ -49,7 +49,7 @@
|
|
||||||
ChallengeResponseAuthentication no
|
|
||||||
|
|
||||||
# Change to no to disable tunnelled clear text passwords
|
|
||||||
-#PasswordAuthentication yes
|
|
||||||
+PasswordAuthentication no
|
|
||||||
|
|
||||||
# Kerberos options
|
|
||||||
#KerberosAuthentication no
|
|
||||||
Loading…
Reference in New Issue
Block a user