diff options
| author | silverwind <me@silverwind.io> | 2024-06-21 17:08:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-21 11:08:42 -0400 |
| commit | 996037fb6a61b1a7f9a0a837fd87bbeab9cad154 (patch) | |
| tree | 976a4b7bd55b949c2106a9b08e015574a65b5b55 | |
| parent | 6f2e150aeb82661b3c9453d2d941b05663dac68b (diff) | |
| download | gitea-996037fb6a61b1a7f9a0a837fd87bbeab9cad154.tar.gz gitea-996037fb6a61b1a7f9a0a837fd87bbeab9cad154.zip | |
Fix deprecated Dockerfile ENV format (#31450)
See
https://docs.docker.com/reference/build-checks/legacy-key-value-format/.
Fixes these warnings seen during the docker build:
```
4 warnings found (use --debug to expand):
- LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 5)
- LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 9)
- LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 75)
- LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 76)
```
Introduced in: https://github.com/moby/buildkit/pull/4923
| -rw-r--r-- | Dockerfile | 8 | ||||
| -rw-r--r-- | Dockerfile.rootless | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Dockerfile b/Dockerfile index 21a8ce0d75..6621dded9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,11 @@ FROM docker.io/library/golang:1.22-alpine3.20 AS build-env ARG GOPROXY -ENV GOPROXY ${GOPROXY:-direct} +ENV GOPROXY=${GOPROXY:-direct} ARG GITEA_VERSION ARG TAGS="sqlite sqlite_unlock_notify" -ENV TAGS "bindata timetzdata $TAGS" +ENV TAGS="bindata timetzdata $TAGS" ARG CGO_EXTRA_CFLAGS # Build deps @@ -72,8 +72,8 @@ RUN addgroup \ git && \ echo "git:*" | chpasswd -e -ENV USER git -ENV GITEA_CUSTOM /data/gitea +ENV USER=git +ENV GITEA_CUSTOM=/data/gitea VOLUME ["/data"] diff --git a/Dockerfile.rootless b/Dockerfile.rootless index b1d2368252..736cea5d05 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -2,11 +2,11 @@ FROM docker.io/library/golang:1.22-alpine3.20 AS build-env ARG GOPROXY -ENV GOPROXY ${GOPROXY:-direct} +ENV GOPROXY=${GOPROXY:-direct} ARG GITEA_VERSION ARG TAGS="sqlite sqlite_unlock_notify" -ENV TAGS "bindata timetzdata $TAGS" +ENV TAGS="bindata timetzdata $TAGS" ARG CGO_EXTRA_CFLAGS #Build deps @@ -75,14 +75,14 @@ COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_au # git:git USER 1000:1000 -ENV GITEA_WORK_DIR /var/lib/gitea -ENV GITEA_CUSTOM /var/lib/gitea/custom -ENV GITEA_TEMP /tmp/gitea -ENV TMPDIR /tmp/gitea +ENV GITEA_WORK_DIR=/var/lib/gitea +ENV GITEA_CUSTOM=/var/lib/gitea/custom +ENV GITEA_TEMP=/tmp/gitea +ENV TMPDIR=/tmp/gitea # TODO add to docs the ability to define the ini to load (useful to test and revert a config) -ENV GITEA_APP_INI /etc/gitea/app.ini -ENV HOME "/var/lib/gitea/git" +ENV GITEA_APP_INI=/etc/gitea/app.ini +ENV HOME="/var/lib/gitea/git" VOLUME ["/var/lib/gitea", "/etc/gitea"] WORKDIR /var/lib/gitea |