From 2cee2e90dc7a5781fefa1e795fec03f9d65087c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Dachary?= Date: Fri, 25 Nov 2022 10:11:23 +0100 Subject: [PATCH] [CI] implementation: forgejo container images (cherry picked from commit dd1971d4e60f37fb76daeb6cef8b1defcc957a34) (cherry picked from commit 3981dbaf8c0dd74b0e82a7afc36809998ac775a2) (cherry picked from commit 8dff3cc2d1a51980439e9ca8f1cad592403c558e) (cherry picked from commit e7673e5d2237733e4e17b9386c4bb25bb88fe2e2) (cherry picked from commit 326174064ba6dbd379ea82e9643e23fe684ad96f) (cherry picked from commit eb769dbde4fb0d7a8a4bd74b6bcdf1f1f180f840) (cherry picked from commit 335829ade20a187c7fd423909231d198a59545bd) (cherry picked from commit 5e8e4f549d2224a00387764e93fdbde34e324c3d) Conflicts: Dockerfile Dockerfile.rootless (cherry picked from commit b777fc91d0ba5b1a061bd9cc57c4818a3357b42a) (cherry picked from commit 02cda642ec7ce2b69de7f0ff4fb4f0d70941f54e) (cherry picked from commit 96ef93f3bc1b618831f04e1ae5d5c7c74e2ed36c) (cherry picked from commit aa424551f24364dd43d9b7739b723bb1d914eeaf) Conflicts: Dockerfile Dockerfile.rootless (cherry picked from commit e54fa86e4904047e5670e68a9dd89e76530564a4) (cherry picked from commit 043fa6d6649272f14a65ee2c9cac15b090e66bc9) (cherry picked from commit 805b16248015e8d7ab8c4f514969cff333d432c8) (cherry picked from commit 86bf362a3c8386cc4530c0c4cba46097ed20d8af) (cherry picked from commit 13e0007959fb5e2496b3bbec916036bd2a05a558) (cherry picked from commit 00ff6f7cb3c54ae3a8ed2069b0dd0dddd98e7e6e) (cherry picked from commit 95c7d8e883da495facfbac39db55b5b710ea25a7) (cherry picked from commit fb033d2bb613c34b7f61c2bad14136f8f110081e) (cherry picked from commit 1147910a552db9fdf7f4ef0a35e9b1d2405b0e69) (cherry picked from commit 6590b6e99c9c31389f6b948976fba3fea8da7eb7) (cherry picked from commit 78938113e4908df1d1e5181c1aa7605e7bc5747d) (cherry picked from commit 57338224f172e30a72f03f565aa47876e1213e77) (cherry picked from commit 4266cbcdd415de2deaea8620fe9b7b53866171ba) (cherry picked from commit bdc766a5a2304fc1826649ac747a2724fed6e7ab) (cherry picked from commit 6fb9ad85046fedf381a948906841098eb4ac010f) (cherry picked from commit c4e6383240c4188fd65bf751aaf8f38466fe60e7) (cherry picked from commit 490fa55b3abab2450073bc2358893687a06305cc) (cherry picked from commit 802c8e72be88b342d3a285cd76a4d3207813d54f) (cherry picked from commit 2b1efe20303be52f7ce142bafe48228822a1350c) (cherry picked from commit fdcdd7389adafc25a158fc510256039e8f98bb2d) (cherry picked from commit b9ae491650c7b8008149cda504439f092ba019ea) (cherry picked from commit e7867c6512957822e6b9fde3dab2288714481f72) (cherry picked from commit 0a43263fa6ad3dd7c20f7a7a8a60720d2a2ab7ea) (cherry picked from commit 64bb6b89820d2202489151a84e00b62e8b580826) (cherry picked from commit dcc1fd6292950fa0ce0cf932c62bc6e016d11b2f) (cherry picked from commit b0250fd53307638c76327ae9a7f20c1ebf79cbe9) (cherry picked from commit 427b05999684f6fac7fee1268d7d61380ae3b800) (cherry picked from commit b6058e28cb7854d7af7073da0534a8ea50381e8b) (cherry picked from commit b91a41dd792cf92dafcc7eba5b08890d351c5456) (cherry picked from commit b8bcb2272660eba1bee4ba5ea332dbdaee7018f1) (cherry picked from commit 69ae87f11f21a96fbe70b893444a6a84830696ea) Conflicts: Dockerfile Dockerfile.rootless https://codeberg.org/forgejo/forgejo/pulls/2029 (cherry picked from commit a4a846a8d510c3de9afc640a67325d4591e3101b) (cherry picked from commit a1a947ce0327af55de1b1682637f5fbbde404d14) (cherry picked from commit 55bd48007f6c45e51546091a644fcd4aa8baa6c0) (cherry picked from commit f012eb7cb09666dbb47c7496084d309abd908171) (cherry picked from commit 59d0824a3d09e0d88367ffea9f6046e90a66dbf5) (cherry picked from commit 59a797db4096eda03032a0ab952fa6c69a6f1686) --- Dockerfile | 2 +- Dockerfile.rootless | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 325b0255df..67c5398917 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,7 @@ RUN chmod 755 /tmp/local/usr/bin/entrypoint \ RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete FROM docker.io/library/alpine:3.19 -LABEL maintainer="maintainers@gitea.io" +LABEL maintainer="contact@forgejo.org" EXPOSE 22 3000 diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 6f27c698ac..a41c27b3e2 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -40,7 +40,7 @@ RUN chmod 755 /tmp/local/usr/local/bin/docker-entrypoint.sh \ RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete FROM docker.io/library/alpine:3.19 -LABEL maintainer="maintainers@gitea.io" +LABEL maintainer="contact@forgejo.org" EXPOSE 2222 3000