diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 56af52b..d93c0af 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ build-base: - docker info - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin script: - - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION" . + - docker build --pull --build-arg "GRAV_VERSION=$GRAV_VERSION" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION" . - docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION" build-git: diff --git a/Dockerfile b/Dockerfile index 92c7074..dd9d72f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,8 @@ FROM nginx:1.15.10-alpine USER root +ARG GRAV_VERSION + # Install PHP And Modules Needed For Grav, With Optional Modules To Help With Performance RUN apk add --no-cache \ php7 \