diff --git a/Makefile b/Makefile index da06fad25..48ba3342a 100644 --- a/Makefile +++ b/Makefile @@ -7,16 +7,6 @@ APP_VERSION_FILE = app/version.py GIT_BRANCH ?= $(shell git symbolic-ref --short HEAD 2> /dev/null || echo "detached") GIT_COMMIT ?= $(shell git rev-parse HEAD 2> /dev/null || echo "") -DOCKER_IMAGE_TAG := $(shell cat docker/VERSION) -DOCKER_BUILDER_IMAGE_NAME = govuk/notify-admin-builder:${DOCKER_IMAGE_TAG} - -BUILD_TAG ?= notifications-admin-manual -BUILD_NUMBER ?= 0 -DEPLOY_BUILD_NUMBER ?= ${BUILD_NUMBER} -BUILD_URL ?= - -DOCKER_CONTAINER_PREFIX = ${USER}-${BUILD_TAG} - CF_API ?= api.cloud.service.gov.uk CF_ORG ?= govuk-notify CF_SPACE ?= ${DEPLOY_ENV} @@ -79,50 +69,6 @@ freeze-requirements: ## create static requirements.txt ${VIRTUALENV_ROOT}/bin/pip install pip-tools ${VIRTUALENV_ROOT}/bin/pip-compile requirements.in -.PHONY: prepare-docker-build-image -prepare-docker-build-image: ## Prepare the Docker builder image - make -C docker build - -define run_docker_container - @docker run -it --rm \ - --name "${DOCKER_CONTAINER_PREFIX}-${1}" \ - -v "`pwd`:/var/project" \ - -e UID=$(shell id -u) \ - -e GID=$(shell id -g) \ - -e GIT_COMMIT=${GIT_COMMIT} \ - -e BUILD_NUMBER=${BUILD_NUMBER} \ - -e BUILD_URL=${BUILD_URL} \ - -e http_proxy="${HTTP_PROXY}" \ - -e HTTP_PROXY="${HTTP_PROXY}" \ - -e https_proxy="${HTTPS_PROXY}" \ - -e HTTPS_PROXY="${HTTPS_PROXY}" \ - -e NO_PROXY="${NO_PROXY}" \ - -e CI_NAME=${CI_NAME} \ - -e CI_BUILD_NUMBER=${BUILD_NUMBER} \ - -e CI_BUILD_URL=${BUILD_URL} \ - -e CI_BRANCH=${GIT_BRANCH} \ - -e CI_PULL_REQUEST=${CI_PULL_REQUEST} \ - -e CF_API="${CF_API}" \ - -e CF_USERNAME="${CF_USERNAME}" \ - -e CF_PASSWORD="${CF_PASSWORD}" \ - -e CF_ORG="${CF_ORG}" \ - -e CF_SPACE="${CF_SPACE}" \ - ${DOCKER_BUILDER_IMAGE_NAME} \ - ${2} -endef - -.PHONY: build-with-docker -build-with-docker: prepare-docker-build-image ## Build inside a Docker container - $(call run_docker_container,build,gosu hostuser make build) - -.PHONY: test-with-docker -test-with-docker: prepare-docker-build-image ## Run tests inside a Docker container - $(call run_docker_container,test,gosu hostuser make test) - -.PHONY: clean-docker-containers -clean-docker-containers: ## Clean up any remaining docker containers - docker rm -f $(shell docker ps -q -f "name=${DOCKER_CONTAINER_PREFIX}") 2> /dev/null || true - .PHONY: clean clean: rm -rf node_modules cache target ${CF_MANIFEST_PATH} diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index c9464a30b..000000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -FROM python:3.5-slim-jessie - -ARG HTTP_PROXY -ARG HTTPS_PROXY -ARG NO_PROXY - -ENV PYTHONUNBUFFERED=1 \ - DEBIAN_FRONTEND=noninteractive \ - NODEJS_VERSION=10.x \ - GOSU_VERSION=1.10 - -RUN \ - echo "Install base packages" \ - && ([ -z "$HTTP_PROXY" ] || echo "Acquire::http::Proxy \"${HTTP_PROXY}\";" > /etc/apt/apt.conf.d/99HttpProxy) \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - apt-transport-https \ - make \ - curl \ - git \ - build-essential \ - libxml2-dev \ - libxslt-dev \ - zlib1g-dev \ - zip \ - rlwrap \ - python-dev \ - libffi-dev \ - libssl-dev \ - libexif-dev \ - libfreetype6-dev \ - libjpeg-dev \ - liblcms2-2 \ - libtiff5-dev \ - zlib1g-dev \ - libpango1.0-dev \ - libcairo2-dev \ - libmagickwand-dev \ - ghostscript \ - jq \ - libjpeg62 \ - - && echo "Install nodejs" \ - && cd /tmp \ - && curl -x "$HTTP_PROXY" -sL https://deb.nodesource.com/setup_${NODEJS_VERSION} | bash - \ - && apt-get install -y --no-install-recommends nodejs \ - - && echo "Clean up" \ - && rm -rf /var/lib/apt/lists/* /tmp/* - -RUN \ - echo "Install global pip packages" \ - && pip install \ - virtualenv \ - awscli \ - wheel - -RUN \ - echo "Install Cloud Foundry CLI" \ - && curl -sSL "https://cli.run.pivotal.io/stable?release=debian64&source=github" -o /tmp/cloudfoundry-cli.deb \ - && dpkg -i /tmp/cloudfoundry-cli.deb - -COPY tianon.gpg /tmp/tianon.gpg - -RUN \ - echo "Install gosu" \ - && curl -sSL -o /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \ - && curl -sSL -o /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --import /tmp/tianon.gpg \ - && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ - && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ - && chmod +x /usr/local/bin/gosu \ - && gosu nobody true - -WORKDIR /var/project - -COPY entrypoint.sh /usr/local/bin/docker-entrypoint - -ENTRYPOINT ["/usr/local/bin/docker-entrypoint"] diff --git a/docker/Makefile b/docker/Makefile deleted file mode 100644 index 949b58b7b..000000000 --- a/docker/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -.DEFAULT_GOAL := help -SHELL := /bin/bash -DOCKER_IMAGE_TAG := $(shell cat VERSION) - -.PHONY: help -help: - @cat $(MAKEFILE_LIST) | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' - -.PHONY: build -build: - docker pull `grep "FROM " Dockerfile | cut -d ' ' -f 2` || true - docker build \ - --build-arg HTTP_PROXY="${HTTP_PROXY}" \ - --build-arg HTTPS_PROXY="${HTTP_PROXY}" \ - --build-arg NO_PROXY="${NO_PROXY}" \ - -t govuk/notify-admin-builder:${DOCKER_IMAGE_TAG} \ - . - -.PHONY: bash -bash: - docker run -it --rm \ - -e UID=$(shell id -u) \ - -e GID=$(shell id -g) \ - govuk/notify-admin-builder:${DOCKER_IMAGE_TAG} \ - bash - -.PHONY: bash -bash-hostuser: - docker run -it --rm \ - -e UID=$(shell id -u) \ - -e GID=$(shell id -g) \ - govuk/notify-admin-builder:${DOCKER_IMAGE_TAG} \ - gosu hostuser bash diff --git a/docker/VERSION b/docker/VERSION deleted file mode 100644 index 0cfbf0888..000000000 --- a/docker/VERSION +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh deleted file mode 100755 index a57515244..000000000 --- a/docker/entrypoint.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -set -eo pipefail; [[ "$TRACE" ]] && set -x - -if [[ "$(id -u)" -ne 0 ]]; then - echo 'docker-entrypoint requires root' >&2 - exit 1 -fi - -if [ -z "$UID" ] || [ "$UID" = "0" ]; then - echo "UID must be specified as a positive integer" - exit 1 -fi - -if [ -z "$GID" ] || [ "$GID" = "0" ]; then - echo "GID must be specified as positive integer" - exit 1 -fi - -USER=$(id -un $UID 2>/dev/null || echo "hostuser") -GROUP=$(getent group $GID | cut -d: -f1 || echo "hostgroup") - -if [ "$USER" = "hostuser" ]; then - useradd -u $UID -s /bin/bash -m $USER -fi - -if [ "$GROUP" = "hostgroup" ]; then - groupadd -g $GID $GROUP -fi - -usermod -g $GROUP $USER - -exec "$@" diff --git a/docker/tianon.gpg b/docker/tianon.gpg deleted file mode 100644 index 415d54907..000000000 Binary files a/docker/tianon.gpg and /dev/null differ