Publish images to https://hub.docker.com/u/bitpoke

bitpoke · Aug 11, 2021 · b23b94f · b23b94f
1 parent abaa9b0
commit b23b94f
Show file tree

Hide file tree

Showing 13 changed files with 72 additions and 407 deletions.
diff --git a/.drone.yml b/.drone.yml
diff --git a/Makefile b/Makefile
@@ -1,15 +1,15 @@
 include common.Makefile
 
-REGISTRY ?= quay.io/presslabs
-PHP_VERSION ?= 7.4.11
-WORDPRESS_VERSION ?= 5.5.1
+REGISTRY ?= docker.io/bitpoke
+PHP_VERSION ?= 7.4.22
+WORDPRESS_VERSION ?= 5.8
 
 ifndef CI
 TAG_SUFFIX ?= canary
 endif
 BUILD_TAG ?= build
 
-# The PHP series for which this version of WordPress builds the default tag, eg. quay.io/presslabs/wordpress-runtime:5.2.2
+# The PHP series for which this version of WordPress builds the default tag, eg. docker.io/bitpoke/wordpress-runtime:5.2.2
 WORDPRESS_PHP_SERIES := $(shell ./hack/wordpress-php-series $(WORDPRESS_VERSION))
 
 # The PHP series for which to build the default bedrock tag

diff --git a/hack/container-structure-test b/hack/container-structure-test
@@ -25,6 +25,6 @@ cd ${PROJECT_ROOT}
 
 exec docker run --rm -w /workspace \
     -v $(pwd):/workspace \
-    -v /var/run/docker.sock:/var/run/docker.sock \
+    -v /workspace/docker.sock:/var/run/docker.sock \
     gcr.io/gcp-runtimes/container-structure-test:v1.8.0 \
     "$@"
diff --git a/project.Makefile b/project.Makefile
@@ -2,7 +2,7 @@ ifndef __PROJECT_MAKEFILE__
 
 __PROJECT_MAKEFILE__ := included
 
-REGISTRY ?= quay.io/presslabs
+REGISTRY ?= docker.io/bitpoke
 
 
 ifndef CI

diff --git a/wordpress/Dockerfile-5.5 b/wordpress/Dockerfile-5.5
diff --git a/wordpress/Dockerfile-5.6 b/wordpress/Dockerfile-5.6
diff --git a/wordpress/Dockerfile-5.7 b/wordpress/Dockerfile-5.7
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=quay.io/presslabs/wordpress-runtime:bedrock-php-7.4
+ARG BASE_IMAGE=docker.io/bitpoke/wordpress-runtime:bedrock-php-7.4
 FROM ${BASE_IMAGE} as bedrock
 ENV WORDPRESS_VERSION=5.7.2
 ENV WP_CONTENT_DIR=${DOCUMENT_ROOT}/wp-content

diff --git a/wordpress/Dockerfile-bedrock b/wordpress/Dockerfile-bedrock
@@ -1,4 +1,4 @@
-ARG PHP_BASE_IMAGE=quay.io/presslabs/php-runtime:7.4
+ARG PHP_BASE_IMAGE=docker.io/bitpoke/php-runtime:7.4
 FROM ${PHP_BASE_IMAGE} as bedrock
 
 ENV WP_CLI_VERSION=2.4.0

diff --git a/wordpress/Dockerfile-bedrock-build b/wordpress/Dockerfile-bedrock-build
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=quay.io/presslabs/wordpress-runtime:bedrock
+ARG BASE_IMAGE=docker.io/bitpoke/wordpress-runtime:bedrock
 FROM ${BASE_IMAGE} as bedrock
 WORKDIR /src
 # Install project dependencies as first build step for child images so that we

diff --git a/wordpress/Dockerfile-bedrock-build-php-7.3 → wordpress/Dockerfile-bedrock-build-php-8.0 b/wordpress/Dockerfile-bedrock-build-php-7.3 → wordpress/Dockerfile-bedrock-build-php-8.0
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=quay.io/presslabs/wordpress-runtime:bedrock-php-7.3
+ARG BASE_IMAGE=docker.io/bitpoke/wordpress-runtime:bedrock-php-8.0
 FROM ${BASE_IMAGE} as bedrock
 WORKDIR /src
 # Install project dependencies as first build step for child images so that we

diff --git a/wordpress/Dockerfile-bedrock-php-7.3 b/wordpress/Dockerfile-bedrock-php-7.3
diff --git a/wordpress/Dockerfile-bedrock-php-8.0 b/wordpress/Dockerfile-bedrock-php-8.0
@@ -1,4 +1,4 @@
-ARG PHP_BASE_IMAGE=quay.io/presslabs/php-runtime:8.0
+ARG PHP_BASE_IMAGE=docker.io/bitpoke/php-runtime:8.0
 FROM ${PHP_BASE_IMAGE} as bedrock
 
 ENV WP_CLI_VERSION=2.2.0

diff --git a/wordpress/Makefile b/wordpress/Makefile
@@ -20,5 +20,14 @@ include ../docker.Makefile
 wordpress-runtime-bedrock: wordpress-runtime-bedrock-build
 push-wordpress-runtime-bedrock: push-wordpress-runtime-bedrock-build
 
-# Modify build targets for bedrock-php-7.3 so that we build, test and publish bedrock-php-7.3 and bedrock-build-php-7.3 variants
-.build/wordpress-runtime-bedrock-php-7.3: .build/wordpress-runtime-bedrock-build-php-7.3
+# Modify build targets for bedrock-php-8.0 so that we build, test and publish bedrock-php-8.0 and bedrock-build-php-8.0 variants
+.build/wordpress-runtime-bedrock-build-php-8.0: .build/wordpress-runtime-bedrock-php-8.0
+.build/wordpress-runtime-bedrock-build-php-8.0: BASE_IMAGE := local.build/wordpress-runtime-bedrock-php-8.0
+.build/wordpress-runtime-bedrock-build-php-8.0: DOCKER_BUILD := docker build
+
+.build/tag-wordpress-runtime-bedrock-build-php-8.0: .build/tag-wordpress-runtime-bedrock-php-8.0
+
+.build/test-wordpress-runtime-bedrock-build-php-8.0: .build/test-wordpress-runtime-bedrock-build-php-8.0 ;
+
+wordpress-runtime-bedrock-php-8.0: wordpress-runtime-bedrock-build-php-8.0
+push-wordpress-runtime-bedrock-php-8.0: push-wordpress-runtime-bedrock-build-php-8.0