mirrors/docker-tachidesk
1
0
Fork 0
mirror of https://github.com/Suwayomi/docker-tachidesk.git synced 2025-12-10 06:42:12 +01:00
Code Issues Projects Releases Wiki Activity

Revert some Alpine changes

Browse Source
This commit is contained in:
Mitchell Syer
2022-10-07 18:42:43 -04:00
committed by GitHub
parent 98b7f68e24
commit 5ede9c0296
4 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
.github/workflows/build_container_images.yml vendored
View File

@@ -23,15 +23,15 @@ on:
env:
build_repo_docker: 'tachidesk'
build_base_image_temurin_ubuntu: 'eclipse-temurin:11-jre-jammy'
build_base_image_temurin_alpine: 'eclipse-temurin:11-jre-alpine'
build_base_image_temurin_platform: 'linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x'
build_base_image_temurin: 'eclipse-temurin:11-jre-jammy'
build_base_image_temurin_platform: 'linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x'
build_base_image_temurin_platform_testing: 'linux/amd64'
build_base_image_alpine: 'alpine:3.16'
build_base_image_alpine_platform: 'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x'
build_base_image_alpine_platform_testing: 'linux/amd64'
startup_script_url: 'https://raw.githubusercontent.com/${{ github.repository }}/main/scripts/startup_script.sh'
tachidesk_webui_stable_url: 'https://api.github.com/repos/suwayomi/Tachidesk-Server/releases/latest'
tachidesk_webui_preview_url: 'https://api.github.com/repos/suwayomi/Tachidesk-Server-preview/releases/latest'
java_8_version: openjdk8-jre-base
java_11_version: openjdk11-jre-headless
jobs:
check_workflow:
@@ -195,7 +195,7 @@ jobs:
file: scripts/dockerfiles/Git_Actions-Dockerfile
platforms: ${{ env.build_base_image_temurin_platform_testing }}
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin_ubuntu }}
BASE_IMAGE=${{ env.build_base_image_temurin }}
BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }}
IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }}
IMAGE_TYPE=stable-ubuntu
@@ -242,9 +242,9 @@ jobs:
uses: docker/build-push-action@v3
with:
file: scripts/dockerfiles/Git_Actions-Dockerfile
platforms: ${{ env.build_base_image_temurin_platform_testing }}
platforms: ${{ env.build_base_image_alpine_platform_testing }}
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin_alpine }}
BASE_IMAGE=${{ env.build_base_image_alpine }}
BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }}
IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }}
IMAGE_TYPE=stable-alpine
@@ -329,7 +329,7 @@ jobs:
platforms: ${{ env.build_base_image_temurin_platform }}
push: ${{ needs.check_stable.outputs.enable_build_publish == 'true' }}
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin_ubuntu }}
BASE_IMAGE=${{ env.build_base_image_temurin }}
BUILD_DATE=${{ needs.check_stable.outputs.build_date }}
IMAGE_VERSION=${{ needs.check_stable.outputs.release_version }}
IMAGE_TYPE=stable-ubuntu
@@ -353,10 +353,10 @@ jobs:
uses: docker/build-push-action@v3
with:
file: scripts/dockerfiles/Git_Actions-Dockerfile
platforms: ${{ env.build_base_image_temurin_platform }}
platforms: ${{ env.build_base_image_alpine_platform }}
push: ${{ needs.check_stable.outputs.enable_build_publish == 'true' }}
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin_alpine }}
BASE_IMAGE=${{ env.build_base_image_alpine }}
BUILD_DATE=${{ needs.check_stable.outputs.build_date }}
IMAGE_VERSION=${{ needs.check_stable.outputs.release_version }}
IMAGE_TYPE=stable-alpine
@@ -459,7 +459,7 @@ jobs:
file: scripts/dockerfiles/Git_Actions-Dockerfile
platforms: ${{ env.build_base_image_temurin_platform_testing }}
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin_ubuntu }}
BASE_IMAGE=${{ env.build_base_image_temurin }}
BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }}
IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }}
IMAGE_TYPE=preview-ubuntu
@@ -508,9 +508,9 @@ jobs:
uses: docker/build-push-action@v3
with:
file: scripts/dockerfiles/Git_Actions-Dockerfile
platforms: ${{ env.build_base_image_temurin_platform_testing }}
platforms: ${{ env.build_base_image_alpine_platform_testing }}
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin_alpine }}
BASE_IMAGE=${{ env.build_base_image_alpine }}
BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }}
IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }}
IMAGE_TYPE=preview-alpine
@@ -597,7 +597,7 @@ jobs:
platforms: ${{ env.build_base_image_temurin_platform }}
push: ${{ needs.check_preview.outputs.enable_build_publish == 'true' }}
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin_ubuntu }}
BASE_IMAGE=${{ env.build_base_image_temurin }}
BUILD_DATE=${{ needs.check_preview.outputs.build_date }}
IMAGE_VERSION=${{ needs.check_preview.outputs.release_version }}
IMAGE_TYPE=preview-ubuntu
@@ -619,10 +619,10 @@ jobs:
uses: docker/build-push-action@v3
with:
file: scripts/dockerfiles/Git_Actions-Dockerfile
platforms: ${{ env.build_base_image_temurin_platform }}
platforms: ${{ env.build_base_image_alpine_platform }}
push: ${{ needs.check_preview.outputs.enable_build_publish == 'true' }}
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin_alpine }}
BASE_IMAGE=${{ env.build_base_image_alpine }}
BUILD_DATE=${{ needs.check_preview.outputs.build_date }}
IMAGE_VERSION=${{ needs.check_preview.outputs.release_version }}
IMAGE_TYPE=preview-alpine

11
.github/workflows/build_test_images.yml vendored
View File

@@ -15,9 +15,10 @@ on:
env:
build_repo_docker: 'tachidesk'
build_base_image_temurin_ubuntu: 'eclipse-temurin:11-jre-jammy'
build_base_image_temurin_alpine: 'eclipse-temurin:11-jre-alpine'
build_base_image_temurin: 'eclipse-temurin:11-jre-jammy'
build_base_image_temurin_platform: 'linux/amd64'
build_base_image_alpine: 'alpine:3.16'
build_base_image_alpine_platform_testing: 'linux/amd64'
startup_script_url: 'https://raw.githubusercontent.com/${{ github.repository }}/main/scripts/startup_script.sh'
tachidesk_webui_stable_url: 'https://api.github.com/repos/suwayomi/Tachidesk-Server/releases/latest'
@@ -78,7 +79,7 @@ jobs:
platforms: ${{ env.build_base_image_temurin_platform }}
push: true
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin_ubuntu }}
BASE_IMAGE=${{ env.build_base_image_temurin }}
BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }}
IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }}
IMAGE_TYPE=develop-ubuntu
@@ -99,10 +100,10 @@ jobs:
uses: docker/build-push-action@v3
with:
file: scripts/dockerfiles/Test_Git_Actions-Dockerfile
platforms: ${{ env.build_base_image_temurin_platform }}
platforms: ${{ env.build_base_image_alpine_platform }}
push: true
build-args: |
BASE_IMAGE=${{ env.build_base_image_temurin_alpine }}
BASE_IMAGE=${{ env.build_base_image_alpine }}
BUILD_DATE=${{ steps.get_latest_release_metadata.outputs.build_date }}
IMAGE_VERSION=${{ steps.get_latest_release_metadata.outputs.release_version }}
IMAGE_TYPE=develop-alpine

3
scripts/dockerfiles/Git_Actions-Dockerfile
View File

@@ -12,7 +12,6 @@ ARG TACHIDESK_FILENAME
ARG TACHIDESK_RELEASE_DOWNLOAD_URL
ARG TACHIDESK_DOCKER_GIT_COMMIT
ARG STARTUP_SCRIPT_URL
ARG JAVA_VERSION
RUN if echo "$BASE_IMAGE" | grep -q "openjdk"; then useradd -ms /bin/sh suwayomi; \
elif echo "$BASE_IMAGE" | grep -q "eclipse-temurin"; then \
@@ -20,7 +19,7 @@ RUN if echo "$BASE_IMAGE" | grep -q "openjdk"; then useradd -ms /bin/sh suwayomi
apk --update add curl tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi; \
else \
useradd -ms /bin/sh suwayomi && apt update && apt install libc++-dev -y; fi; \
elif echo "$BASE_IMAGE" | grep -q "alpine"; then apk --update add curl "$JAVA_VERSION" tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi; \
elif echo "$BASE_IMAGE" | grep -q "alpine"; then apk --update add curl openjdk8-jre-base tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi; \
else echo "wrong base image"; \
fi

3
scripts/dockerfiles/Test_Git_Actions-Dockerfile
View File

@@ -12,7 +12,6 @@ ARG TACHIDESK_FILENAME
ARG TACHIDESK_RELEASE_DOWNLOAD_URL
ARG TACHIDESK_DOCKER_GIT_COMMIT
ARG STARTUP_SCRIPT_URL
ARG JAVA_VERSION
RUN if echo "$BASE_IMAGE" | grep -q "openjdk"; then useradd -ms /bin/sh suwayomi; \
elif echo "$BASE_IMAGE" | grep -q "eclipse-temurin"; then \
@@ -20,7 +19,7 @@ RUN if echo "$BASE_IMAGE" | grep -q "openjdk"; then useradd -ms /bin/sh suwayomi
apk --update add curl tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi; \
else \
useradd -ms /bin/sh suwayomi && apt update && apt install libc++-dev -y; fi; \
elif echo "$BASE_IMAGE" | grep -q "alpine"; then apk --update add curl "$JAVA_VERSION" tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi; \
elif echo "$BASE_IMAGE" | grep -q "alpine"; then apk --update add curl openjdk8-jre-base tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi; \
else echo "wrong base image"; \
fi