Merge branch 'master' into fix+update/seasons

jikan-me · Oct 27, 2022 · 0a35a0b · 0a35a0b
2 parents ad85779 + 1f8073d
commit 0a35a0b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/container-base-image-release.yml b/.github/workflows/container-base-image-release.yml
@@ -28,8 +28,8 @@ jobs:
             ghcr.io/jikan-me/jikan-rest-php
             jikanme/jikan-rest-php
           tags: |
-            type=raw,value=latest
             type=sha
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2

diff --git a/docker/base_image/php-8.0/Dockerfile b/docker/base_image/php-8.0/Dockerfile
@@ -3,6 +3,7 @@ FROM composer:2.3.9 as composer
 FROM mlocati/php-extension-installer:1.5.29 as php-ext-installer
 FROM php:8.0-bullseye as runtime
 ARG GITHUB_PERSONAL_TOKEN
+LABEL org.opencontainers.image.source=https://github.com/jikan-me/jikan-rest/docker/base_image/php-8.0
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 COPY --from=php-ext-installer /usr/bin/install-php-extensions /usr/local/bin/
 ENV COMPOSER_HOME="/tmp/composer"

diff --git a/docker/base_image/php-8.0/readme.md b/docker/base_image/php-8.0/readme.md
@@ -0,0 +1,3 @@
+# Jikan Rest Base image
+
+The base image for Jikan REST app, to speed up container builds. This is mostly for internal use.
diff --git a/docker/base_image/php-8.1/Dockerfile b/docker/base_image/php-8.1/Dockerfile
@@ -3,6 +3,7 @@ FROM composer:2.3.9 as composer
 FROM mlocati/php-extension-installer:1.5.29 as php-ext-installer
 FROM php:8.1-bullseye as runtime
 ARG GITHUB_PERSONAL_TOKEN
+LABEL org.opencontainers.image.source=https://github.com/jikan-me/jikan-rest/docker/base_image/php-8.1
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 COPY --from=php-ext-installer /usr/bin/install-php-extensions /usr/local/bin/
 ENV COMPOSER_HOME="/tmp/composer"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Jikan Rest Base image

		The base image for Jikan REST app, to speed up container builds. This is mostly for internal use.