Update docker container configuration and image

.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
 # This folder is cached between builds
 # http://docs.gitlab.com/ce/ci/yaml/README.html#cache
 cache:
-  key: ${CI_COMMIT_REF_SLUG}
+  key: ${CI_JOB_NAME_SLUG}-${CI_COMMIT_REF_SLUG}
   paths:
   - vendor/
 

.gitlab-docker-x86_64.yml

@@ -1,33 +1,27 @@
 docker:
-  image: docker:latest
+  variables:
+    VERSION: latest
+    DOCKER_HOST: tcp://docker:2375
 
   stage: build
 
+  image: docker:latest
   services:
   - docker:dind
 
-  variables:
-    VERSION: latest
-    CACHETAG: build-${VERSION}
-    DOCKER_HOST: tcp://docker:2375
-
-  tags:
-    - docker
-    - x86_64
-  only:
-    - master
-
   before_script:
-    - docker info
-    - docker version
+  - docker info && docker version
   - 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
 
   script:
   - 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
-    - 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} .
+  - rm -rf vendor/ database/schema database/seeders database/factories/*
+  - docker build -t ${CI_REGISTRY_IMAGE}:${VERSION} .
   - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
-    - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
+  tags:
+  - docker
+  - x86_64
+  only:
+  - master

.gitlab-test.yml

@@ -1,5 +1,5 @@
 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
 
@@ -22,8 +22,8 @@ test:
   - mv .env.testing .env
 
   # Install Composer and project dependencies.
-    - mkdir -p /root/.composer
-    - if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > /root/.composer/auth.json ; fi
+  - mkdir -p ${COMPOSER_HOME}
+  - if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > ${COMPOSER_HOME}/auth.json; fi
   - composer install
 
   # Generate an application key. Re-cache.

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/
 
-RUN mkdir /var/www/.composer \
-	&& ([ -r auth.json ] && mv auth.json /var/www/.composer/) || true \
-	&& touch .composer.refresh \
-	&& mv .env.example .env \
-	&& FORCE_PERMS=1 NGINX_START=FALSE /sbin/init \
-	&& chmod +x /var/www/html/artisan /var/www/html/init-php.sh \
-	&& touch .migrate \
-	&& rm -rf /var/www/.composer/*
+RUN mkdir -p ${COMPOSER_HOME} && \
+	([ -r auth.json ] && mv auth.json ${COMPOSER_HOME}) || true && \
+	touch .composer.refresh && \
+	mv .env.example .env && \
+	FORCE_PERMS=1 NGINX_START=FALSE /sbin/init && \
+	chmod +x /var/www/html/artisan /var/www/html/init-php.sh && \
+	touch .migrate && \
+	rm -rf ${COMPOSER_HOME}/*