diff --git a/containers/apps/db-wait-mariadb/Dockerfile b/containers/apps/db-wait-mariadb/Dockerfile index cd6fe4a46d1..e607ee4b976 100644 --- a/containers/apps/db-wait-mariadb/Dockerfile +++ b/containers/apps/db-wait-mariadb/Dockerfile @@ -34,7 +34,7 @@ RUN \ USER apps -COPY ./apps/db-wait-mariadb/entrypoint.sh /entrypoint.sh +COPY ./containers/apps/db-wait-mariadb/entrypoint.sh /entrypoint.sh CMD ["/entrypoint.sh"] LABEL "maintainer"="TrueCharts " diff --git a/containers/apps/db-wait-mongodb/Dockerfile b/containers/apps/db-wait-mongodb/Dockerfile index c7295f0b0d1..e20ffbfe143 100644 --- a/containers/apps/db-wait-mongodb/Dockerfile +++ b/containers/apps/db-wait-mongodb/Dockerfile @@ -42,7 +42,7 @@ RUN \ USER apps -COPY ./apps/db-wait-mongodb/entrypoint.sh /entrypoint.sh +COPY ./containers/apps/db-wait-mongodb/entrypoint.sh /entrypoint.sh CMD ["/entrypoint.sh"] LABEL "maintainer"="TrueCharts " diff --git a/containers/apps/db-wait-postgres/Dockerfile b/containers/apps/db-wait-postgres/Dockerfile index 99654d83c50..2b0790c9889 100644 --- a/containers/apps/db-wait-postgres/Dockerfile +++ b/containers/apps/db-wait-postgres/Dockerfile @@ -34,7 +34,7 @@ RUN \ USER apps -COPY ./apps/db-wait-postgres/entrypoint.sh /entrypoint.sh +COPY ./containers/apps/db-wait-postgres/entrypoint.sh /entrypoint.sh CMD ["/entrypoint.sh"] LABEL "maintainer"="TrueCharts " diff --git a/containers/apps/db-wait-redis/Dockerfile b/containers/apps/db-wait-redis/Dockerfile index a61f3f1f162..eb999f84bb6 100644 --- a/containers/apps/db-wait-redis/Dockerfile +++ b/containers/apps/db-wait-redis/Dockerfile @@ -34,7 +34,7 @@ RUN \ USER apps -COPY ./apps/db-wait-redis/entrypoint.sh /entrypoint.sh +COPY ./containers/apps/db-wait-redis/entrypoint.sh /entrypoint.sh CMD ["/entrypoint.sh"] LABEL "maintainer"="TrueCharts " diff --git a/containers/apps/freeradius/Dockerfile b/containers/apps/freeradius/Dockerfile index 1f18d7fe973..babca5056a9 100644 --- a/containers/apps/freeradius/Dockerfile +++ b/containers/apps/freeradius/Dockerfile @@ -11,7 +11,7 @@ RUN \ rm -Rf /etc/raddb VOLUME /etc/raddb -COPY ./apps/freeradius/entrypoint.sh /docker-entrypoint.sh +COPY ./containers/apps/freeradius/entrypoint.sh /docker-entrypoint.sh LABEL "maintainer"="TrueCharts " LABEL "org.opencontainers.image.source"="https://github.com/truecharts/apps" diff --git a/containers/apps/kube-sa-proxy/Dockerfile b/containers/apps/kube-sa-proxy/Dockerfile index fdc71586c5c..b94d4836a32 100644 --- a/containers/apps/kube-sa-proxy/Dockerfile +++ b/containers/apps/kube-sa-proxy/Dockerfile @@ -11,16 +11,16 @@ RUN mkdir -p /build /output WORKDIR /build # Copy go mod and sum files -COPY apps/kube-sa-proxy/go.mod apps/kube-sa-proxy/go.sum ./ +COPY ./containers/apps/kube-sa-proxy/go.mod apps/kube-sa-proxy/go.sum ./ # Download dependencies RUN go mod download # Copy the rest of the Go application source code -COPY apps/kube-sa-proxy/cmd/main.go . -COPY apps/kube-sa-proxy/internal/config ./internal/config -COPY apps/kube-sa-proxy/internal/proxy ./internal/proxy -COPY apps/kube-sa-proxy/internal/utils ./internal/utils +COPY ./containers/apps/kube-sa-proxy/cmd/main.go . +COPY ./containers/apps/kube-sa-proxy/internal/config ./internal/config +COPY ./containers/apps/kube-sa-proxy/internal/proxy ./internal/proxy +COPY ./containers/apps/kube-sa-proxy/internal/utils ./internal/utils # Build the Go application RUN go build -ldflags "-w -s" -o /output/my-proxy-service . diff --git a/containers/apps/nextcloud-fpm/Dockerfile b/containers/apps/nextcloud-fpm/Dockerfile index 75b5784c8d1..9516cf8272b 100644 --- a/containers/apps/nextcloud-fpm/Dockerfile +++ b/containers/apps/nextcloud-fpm/Dockerfile @@ -53,16 +53,16 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # Copy occ script to /usr/bin/occ -COPY --chmod=755 ./apps/nextcloud-fpm/scripts/occ /usr/bin/occ +COPY --chmod=755 ./containers/apps/nextcloud-fpm/scripts/occ /usr/bin/occ # Copy post-install script to a temp location so we can append it to the entrypoint.sh -COPY --chmod=755 ./apps/nextcloud-fpm/scripts/post-install.sh /tmp/post-install.sh +COPY --chmod=755 ./containers/apps/nextcloud-fpm/scripts/post-install.sh /tmp/post-install.sh # Copy the healthcheck -COPY --chmod=755 ./apps/nextcloud-fpm/scripts/healthcheck.sh /healthcheck.sh +COPY --chmod=755 ./containers/apps/nextcloud-fpm/scripts/healthcheck.sh /healthcheck.sh # Copy the configure-scripts that will be sourced by the post-install -COPY --chmod=755 ./apps/nextcloud-fpm/configure-scripts /configure-scripts +COPY --chmod=755 ./containers/apps/nextcloud-fpm/configure-scripts /configure-scripts RUN set -ex; \ sed -i 's/exec "$@"//g' /entrypoint.sh; \ diff --git a/containers/apps/ombi/Dockerfile b/containers/apps/ombi/Dockerfile index 922a7cbe513..9d14c8fe94e 100644 --- a/containers/apps/ombi/Dockerfile +++ b/containers/apps/ombi/Dockerfile @@ -42,7 +42,7 @@ USER apps EXPOSE 3579 -COPY ./apps/ombi/entrypoint.sh /entrypoint.sh +COPY ./containers/apps/ombi/entrypoint.sh /entrypoint.sh CMD ["/entrypoint.sh"] LABEL "maintainer"="TrueCharts " diff --git a/containers/apps/traefik/Dockerfile b/containers/apps/traefik/Dockerfile index b2c9095e9b4..e708e20794a 100644 --- a/containers/apps/traefik/Dockerfile +++ b/containers/apps/traefik/Dockerfile @@ -32,7 +32,7 @@ SHELL ["/bin/ash", "-eo", "pipefail", "-c"] # hadolint ignore=DL3018 RUN apk add --no-cache --update git -COPY --chmod=777 ./apps/traefik/clone-plugins.sh /clone-plugins.sh +COPY --chmod=777 ./containers/apps/traefik/clone-plugins.sh /clone-plugins.sh RUN /clone-plugins.sh FROM traefik:v3.1.6@sha256:f703a2ac2ddf75f6e06c9cccac7f158765e2ab42d642b04e79e2e3d7355c2ddc diff --git a/containers/base/alpine/Dockerfile b/containers/base/alpine/Dockerfile index 824db6ad507..6299ee46b00 100644 --- a/containers/base/alpine/Dockerfile +++ b/containers/base/alpine/Dockerfile @@ -28,8 +28,8 @@ VOLUME [ "/config" ] USER apps -COPY ./base/ubuntu/entrypoint.sh /entrypoint.sh -COPY ./base/ubuntu/shim /etc/profile.d +COPY ./containers/base/ubuntu/entrypoint.sh /entrypoint.sh +COPY ./containers/base/ubuntu/shim /etc/profile.d ENTRYPOINT ["/bin/ash", "--"] diff --git a/containers/base/ubuntu/Dockerfile b/containers/base/ubuntu/Dockerfile index 0d837552078..5aba993b7d1 100644 --- a/containers/base/ubuntu/Dockerfile +++ b/containers/base/ubuntu/Dockerfile @@ -112,8 +112,8 @@ ENV LANG en_US.UTF-8 VOLUME ["/config"] -COPY ./base/ubuntu/entrypoint.sh /entrypoint.sh -COPY ./base/ubuntu/shim /shim +COPY ./containers/base/ubuntu/entrypoint.sh /entrypoint.sh +COPY ./containers/base/ubuntu/shim /shim USER apps