From f6db605564399afe040390c1d99f0fca97d3ad0c Mon Sep 17 00:00:00 2001 From: Mitchell Syer Date: Tue, 3 Jan 2023 00:39:53 +0000 Subject: [PATCH] Move things around --- scripts/dockerfiles/Git_Actions-Dockerfile | 5 +++-- scripts/dockerfiles/Test_Git_Actions-Dockerfile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/dockerfiles/Git_Actions-Dockerfile b/scripts/dockerfiles/Git_Actions-Dockerfile index 3099e14..8e60052 100644 --- a/scripts/dockerfiles/Git_Actions-Dockerfile +++ b/scripts/dockerfiles/Git_Actions-Dockerfile @@ -1,4 +1,7 @@ ARG BASE_IMAGE=none + +FROM $BASE_IMAGE as base + ARG BASE_IMAGE ARG BUILD_DATE ARG PLATFORM @@ -16,8 +19,6 @@ ARG SUPERVISORD_WEBSOCKIFY_URL ARG SUPERVISORD_X11VNC_URL ARG SUPERVISORD_XVFB_URL -FROM $BASE_IMAGE as base - FROM base as branch-base-alpine RUN apk --update add curl openjdk8-jre-base tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi; diff --git a/scripts/dockerfiles/Test_Git_Actions-Dockerfile b/scripts/dockerfiles/Test_Git_Actions-Dockerfile index 79aa149..8ab054e 100644 --- a/scripts/dockerfiles/Test_Git_Actions-Dockerfile +++ b/scripts/dockerfiles/Test_Git_Actions-Dockerfile @@ -1,4 +1,7 @@ ARG BASE_IMAGE=none + +FROM $BASE_IMAGE as base + ARG BASE_IMAGE ARG BUILD_DATE ARG PLATFORM @@ -16,8 +19,6 @@ ARG SUPERVISORD_WEBSOCKIFY_URL ARG SUPERVISORD_X11VNC_URL ARG SUPERVISORD_XVFB_URL -FROM $BASE_IMAGE as base - FROM base as branch-base-alpine RUN apk --update add curl openjdk8-jre-base tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi;