From ed8d90de6bb9513a2dcdc70aac446bbcaf0855c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Dachary?= Date: Thu, 23 Feb 2023 22:26:33 +0100 Subject: [PATCH] [BRANDING] symlink gitea to forgejo in docker containers (cherry picked from commit 9c06a318b867ea8c60dd194ca393bac3b718b07b) (cherry picked from commit 95859da3b40306c1e07277230c2f401ef8b82a13) (cherry picked from commit e3a5f6c1ed4e5452f3664aa8d398805c3b9c0a51) (cherry picked from commit 7b9b259c75e0b2b805a2239ecf7c85a3f0dbd648) (cherry picked from commit c4a152c8dc4ab5d20c72f9f7d60ce6eee3be5cda) (cherry picked from commit b00bf599efa97a18adac134a1402418785c5bae2) (cherry picked from commit a7836ee2ee2638091f0f9ff5543548ae0bb94060) (cherry picked from commit 3ea7dcbd5b196b6fc9115d49d50678a1a5940c0b) (cherry picked from commit 454d705e830ade3a41a33341b82d4c8aff584dcd) (cherry picked from commit 35e06c3009f4a1942222dc35cc0993a623164b25) (cherry picked from commit 904468a38ffdfb8157dc4eaf92b3ba10c3a957db) (cherry picked from commit 890e86815a5a33b2930150a7460cd96b4360ac88) (cherry picked from commit bf9f94c63d8c15ce62881ccadc28681848b7ebd7) (cherry picked from commit d025d061d14929aaabbfc4603099e32cb888ac3b) (cherry picked from commit 32f209a8e1b2ee109f7ae8b150d4390318c0ff2a) (cherry picked from commit 38ef6802fca7301f4cb03769e8d6dae1e256933f) (cherry picked from commit 8a19bbd2a8160b7d3d5a1ea083507b4311070ab6) (cherry picked from commit f352dee786d2541fbe360fe8f859d3182c632240) (cherry picked from commit b53d9fc090b58848876b4f97e8ed03face85a63b) (cherry picked from commit 3dae21f4c87c82b75515d3db43c1bbd4d9f3f1ac) (cherry picked from commit 8b59e016c7a1eb3f6d0077d8e6f205b8bcefe402) (cherry picked from commit 6f54ea6a0eb0f9c4360237f78eb76c55678547e2) --- Dockerfile | 1 + Dockerfile.rootless | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 470ded4da1..93414d5627 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,6 +77,7 @@ ENTRYPOINT ["/usr/bin/entrypoint"] CMD ["/bin/s6-svscan", "/etc/s6"] COPY docker/root / +RUN cd /usr/local/bin ; ln -s gitea forgejo COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea COPY --from=build-env /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 78ee81b4f4..3c694943a5 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -67,6 +67,7 @@ RUN mkdir -p /var/lib/gitea /etc/gitea RUN chown git:git /var/lib/gitea /etc/gitea COPY docker/rootless / +RUN cd /usr/local/bin ; ln -s gitea forgejo COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh