Commit cb09e7c7 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Make build-arg names match GitLab-CI variable names 

This will allow interpretation of build-args in helper scripts.
parent dc7a246b

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ before_script: 
    --target=${TARGET}

    --build-arg BUILDKIT_INLINE_CACHE=1

    $(cache_arg)

    ${NGINX_VERSION:+--build-arg=nginx_version=$NGINX_VERSION}

    ${PHP_VERSION:+--build-arg=php_version=$PHP_VERSION}

    ${WORDPRESS_VERSION:+--build-arg=wp_version=$WORDPRESS_VERSION}

    ${NGINX_VERSION:+--build-arg=NGINX_VERSION=$NGINX_VERSION}

    ${PHP_VERSION:+--build-arg=PHP_VERSION=$PHP_VERSION}

    ${WORDPRESS_VERSION:+--build-arg=WORDPRESS_VERSION=$WORDPRESS_VERSION}

  - docker push ${BUILD_TAG}

  - push_cache ${BUILD_TAG}

Dockerfile

+6 −6
Original line number Diff line number Diff line 
# syntax = docker/dockerfile:1.0-experimental



## Stage Nginx

ARG nginx_version=latest

FROM nginx:${nginx_version} as nginx-stage

ARG NGINX_VERSION=latest

FROM nginx:${NGINX_VERSION} as nginx-stage

ENV STAGE=/stage

COPY --from=docker.kodo.org.uk/kodo.org.uk/docker/docker-build-helpers:latest \

    /scripts /bin
@@ -24,8 +24,8 @@ CMD ["/usr/sbin/nginx", "-g", "daemon off;"] 




## Stage PHP

ARG php_version=

FROM php:${php_version:+$php_version-}fpm-alpine as php-stage

ARG PHP_VERSION=

FROM php:${PHP_VERSION:+$PHP_VERSION-}fpm-alpine as php-stage

ENV STAGE=/stage/php

RUN --mount=type=bind,source=scripts/install-deps.sh,target=/step /step

RUN --mount=type=bind,source=scripts/compile.sh,target=/step /step
@@ -36,14 +36,14 @@ RUN --mount=type=bind,source=scripts/prepare-stage.sh,target=/step /step 


## Stage Wordpress

FROM php-stage as wordpress-stage

ARG wp_version=latest

ARG WORDPRESS_VERSION=latest

WORKDIR /stage/wordpress/app

ENV STAGE=/stage/wordpress WORDPRESS_ROOT=/stage/wordpress/app

COPY scripts/wp.sh /stage/wordpress/usr/bin/wp

COPY data/composer.json composer.json

COPY plugins wp-content/mu-plugins

RUN --mount=type=bind,source=scripts/install-wp.sh,target=/step \

    /step ${wp_version}

    /step ${WORDPRESS_VERSION}





## Stage configuration