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

Merge branch 'develop' into 'master' 

Build fixes

See merge request !1
parents 7e1e3dc0 b650fd5f

.gitlab-ci.yml

+7 −16
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ image: docker:stable 
variables:

  DOCKER_HOST: "tcp://docker:2375/"

  DOCKER_DRIVER: "overlay2"

  DOCKER_TLS_CERTDIR: ""

  DOCKER_BUILDKIT: "1"



services:
@@ -11,7 +12,6 @@ services: 
before_script:

- docker info

- docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY"

- apk update && apk add bash





.build: &build
@@ -35,21 +35,12 @@ build-nginx: 


.push-tags: &push-tags

  stage: deploy

  when: manual

  script:

  - version=`eval "docker run --rm

    ${CI_REGISTRY_IMAGE}/${CI_JOB_NAME#push-}/build:${CI_PIPELINE_ID}

    ${GET_VERSION}"`

  - docker pull

    ${CI_REGISTRY_IMAGE}/${CI_JOB_NAME#push-}/build:${CI_PIPELINE_ID}

  - docker tag

    ${CI_REGISTRY_IMAGE}/${CI_JOB_NAME#push-}/build:${CI_PIPELINE_ID}

    ${CI_REGISTRY_IMAGE}/${CI_JOB_NAME#push-}:${version}

  - docker tag

    ${CI_REGISTRY_IMAGE}/${CI_JOB_NAME#push-}/build:${CI_PIPELINE_ID}

    ${CI_REGISTRY_IMAGE}/${CI_JOB_NAME#push-}:latest

  - docker push ${CI_REGISTRY_IMAGE}/${CI_JOB_NAME#push-}:${version}

  - docker push ${CI_REGISTRY_IMAGE}/${CI_JOB_NAME#push-}:latest

  only: [master, develop]

  script: |

    BUILD_REPO=${CI_REGISTRY_IMAGE}/${CI_JOB_NAME#push-}/build:${CI_PIPELINE_ID}

    DEPLOY_REPO=${CI_REGISTRY_IMAGE}/${CI_JOB_NAME#push-}

    VERSION=`eval "docker run --rm ${BUILD_REPO} ${GET_VERSION}"`

    . scripts/deploy.sh



push-fastcgi:

  <<: *push-tags

Dockerfile

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ LABEL uk.org.kodo.maintainer "Dom Sekotill <dom.sekotill@kodo.org.uk>" 


ARG wp_version=latest

WORKDIR /app

VOLUME /app/wp-content

ENV WORDPRESS_ROOT=/app



ADD https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \

scripts/deploy.sh

0 → 100755
+20 −0
Original line number Diff line number Diff line 
#!/bin/sh

set -eu



: ${BUILD_REPO?}

: ${DEPLOY_REPO?}



case ${CI_COMMIT_REF_NAME-develop} in

	master) tags="latest ${VERSION-}" ;;

	develop) tags="unstable" ;;

	*) exit 3 ;;

esac



set -x



docker pull ${BUILD_REPO}



for tag in $tags; do

	docker tag ${BUILD_REPO} ${DEPLOY_REPO}:${tag}

	docker push ${DEPLOY_REPO}:${tag}

done