Move things around

This commit is contained in:
Mitchell Syer
2023-01-03 00:39:53 +00:00
parent bdc689faa7
commit f6db605564
2 changed files with 6 additions and 4 deletions

View File

@@ -1,4 +1,7 @@
ARG BASE_IMAGE=none ARG BASE_IMAGE=none
FROM $BASE_IMAGE as base
ARG BASE_IMAGE ARG BASE_IMAGE
ARG BUILD_DATE ARG BUILD_DATE
ARG PLATFORM ARG PLATFORM
@@ -16,8 +19,6 @@ ARG SUPERVISORD_WEBSOCKIFY_URL
ARG SUPERVISORD_X11VNC_URL ARG SUPERVISORD_X11VNC_URL
ARG SUPERVISORD_XVFB_URL ARG SUPERVISORD_XVFB_URL
FROM $BASE_IMAGE as base
FROM base as branch-base-alpine 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; RUN apk --update add curl openjdk8-jre-base tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi;

View File

@@ -1,4 +1,7 @@
ARG BASE_IMAGE=none ARG BASE_IMAGE=none
FROM $BASE_IMAGE as base
ARG BASE_IMAGE ARG BASE_IMAGE
ARG BUILD_DATE ARG BUILD_DATE
ARG PLATFORM ARG PLATFORM
@@ -16,8 +19,6 @@ ARG SUPERVISORD_WEBSOCKIFY_URL
ARG SUPERVISORD_X11VNC_URL ARG SUPERVISORD_X11VNC_URL
ARG SUPERVISORD_XVFB_URL ARG SUPERVISORD_XVFB_URL
FROM $BASE_IMAGE as base
FROM base as branch-base-alpine 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; RUN apk --update add curl openjdk8-jre-base tzdata && addgroup -g 1000 -S suwayomi && adduser -u 1000 -S suwayomi -G suwayomi;