Update docker container configuration and image
This commit is contained in:
parent
04be81852a
commit
829120fbad
@ -5,7 +5,7 @@ stages:
|
|||||||
# This folder is cached between builds
|
# This folder is cached between builds
|
||||||
# http://docs.gitlab.com/ce/ci/yaml/README.html#cache
|
# http://docs.gitlab.com/ce/ci/yaml/README.html#cache
|
||||||
cache:
|
cache:
|
||||||
key: ${CI_COMMIT_REF_SLUG}
|
key: ${CI_JOB_NAME_SLUG}-${CI_COMMIT_REF_SLUG}
|
||||||
paths:
|
paths:
|
||||||
- vendor/
|
- vendor/
|
||||||
|
|
||||||
|
@ -1,33 +1,27 @@
|
|||||||
docker:
|
docker:
|
||||||
image: docker:latest
|
variables:
|
||||||
|
VERSION: latest
|
||||||
|
DOCKER_HOST: tcp://docker:2375
|
||||||
|
|
||||||
stage: build
|
stage: build
|
||||||
|
|
||||||
|
image: docker:latest
|
||||||
services:
|
services:
|
||||||
- docker:dind
|
- docker:dind
|
||||||
|
|
||||||
variables:
|
|
||||||
VERSION: latest
|
|
||||||
CACHETAG: build-${VERSION}
|
|
||||||
DOCKER_HOST: tcp://docker:2375
|
|
||||||
|
|
||||||
tags:
|
|
||||||
- docker
|
|
||||||
- x86_64
|
|
||||||
only:
|
|
||||||
- master
|
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- docker info
|
- docker info && docker version
|
||||||
- docker version
|
|
||||||
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
|
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
|
||||||
- if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > auth.json; fi
|
- if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > auth.json; fi
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- if [ -f init ]; then chmod 500 init; fi
|
- if [ -f init ]; then chmod 500 init; fi
|
||||||
- ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "true"
|
|
||||||
- echo -n ${CI_COMMIT_SHORT_SHA} > VERSION
|
- echo -n ${CI_COMMIT_SHORT_SHA} > VERSION
|
||||||
- rm -rf vendor/ database/schema database/seeders database/factories
|
- rm -rf vendor/ database/schema database/seeders database/factories/*
|
||||||
- docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
|
- docker build -t ${CI_REGISTRY_IMAGE}:${VERSION} .
|
||||||
- docker push ${CI_REGISTRY_IMAGE}:${VERSION}
|
- docker push ${CI_REGISTRY_IMAGE}:${VERSION}
|
||||||
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
|
tags:
|
||||||
|
- docker
|
||||||
|
- x86_64
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
test:
|
test:
|
||||||
image: ${CI_REGISTRY}/leenooks/php:8.1-fpm-server-test
|
image: ${CI_REGISTRY}/leenooks/php:8.1-fpm-alpine-pgsql-server-test
|
||||||
|
|
||||||
stage: test
|
stage: test
|
||||||
|
|
||||||
@ -22,8 +22,8 @@ test:
|
|||||||
- mv .env.testing .env
|
- mv .env.testing .env
|
||||||
|
|
||||||
# Install Composer and project dependencies.
|
# Install Composer and project dependencies.
|
||||||
- mkdir -p /root/.composer
|
- mkdir -p ${COMPOSER_HOME}
|
||||||
- if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > /root/.composer/auth.json ; fi
|
- if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > ${COMPOSER_HOME}/auth.json; fi
|
||||||
- composer install
|
- composer install
|
||||||
|
|
||||||
# Generate an application key. Re-cache.
|
# Generate an application key. Re-cache.
|
||||||
|
18
Dockerfile
18
Dockerfile
@ -1,12 +1,12 @@
|
|||||||
FROM registry.leenooks.net/leenooks/php:8.1-fpm-server
|
FROM registry.dege.au/leenooks/php:8.1-fpm-alpine-pgsql-server
|
||||||
|
|
||||||
COPY . /var/www/html/
|
COPY . /var/www/html/
|
||||||
|
|
||||||
RUN mkdir /var/www/.composer \
|
RUN mkdir -p ${COMPOSER_HOME} && \
|
||||||
&& ([ -r auth.json ] && mv auth.json /var/www/.composer/) || true \
|
([ -r auth.json ] && mv auth.json ${COMPOSER_HOME}) || true && \
|
||||||
&& touch .composer.refresh \
|
touch .composer.refresh && \
|
||||||
&& mv .env.example .env \
|
mv .env.example .env && \
|
||||||
&& FORCE_PERMS=1 NGINX_START=FALSE /sbin/init \
|
FORCE_PERMS=1 NGINX_START=FALSE /sbin/init && \
|
||||||
&& chmod +x /var/www/html/artisan /var/www/html/init-php.sh \
|
chmod +x /var/www/html/artisan /var/www/html/init-php.sh && \
|
||||||
&& touch .migrate \
|
touch .migrate && \
|
||||||
&& rm -rf /var/www/.composer/*
|
rm -rf ${COMPOSER_HOME}/*
|
||||||
|
Loading…
Reference in New Issue
Block a user