Skip to content

Commit 405a60d

Browse files
techknowlogick6543
authored andcommitted
alpine 3.16 (go-gitea#19797)
Co-authored-by: 6543 <[email protected]>
1 parent 793ee1d commit 405a60d

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

Dockerfile

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Build stage
2-
FROM golang:1.17-alpine3.15 AS build-env
2+
FROM golang:1.18-alpine3.16 AS build-env
33

44
ARG GOPROXY
55
ENV GOPROXY ${GOPROXY:-direct}
@@ -18,39 +18,39 @@ WORKDIR ${GOPATH}/src/code.gitea.io/gitea
1818

1919
#Checkout version if set
2020
RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
21-
&& make clean-all build
21+
&& make clean-all build
2222

2323
# Begin env-to-ini build
2424
RUN go build contrib/environment-to-ini/environment-to-ini.go
2525

26-
FROM alpine:3.15
26+
FROM alpine:3.16
2727
LABEL maintainer="[email protected]"
2828

2929
EXPOSE 22 3000
3030

3131
RUN apk --no-cache add \
32-
bash \
33-
ca-certificates \
34-
curl \
35-
gettext \
36-
git \
37-
linux-pam \
38-
openssh \
39-
s6 \
40-
sqlite \
41-
su-exec \
42-
gnupg
32+
bash \
33+
ca-certificates \
34+
curl \
35+
gettext \
36+
git \
37+
linux-pam \
38+
openssh \
39+
s6 \
40+
sqlite \
41+
su-exec \
42+
gnupg
4343

4444
RUN addgroup \
45-
-S -g 1000 \
46-
git && \
45+
-S -g 1000 \
46+
git && \
4747
adduser \
48-
-S -H -D \
49-
-h /data/git \
50-
-s /bin/bash \
51-
-u 1000 \
52-
-G git \
53-
git && \
48+
-S -H -D \
49+
-h /data/git \
50+
-s /bin/bash \
51+
-u 1000 \
52+
-G git \
53+
git && \
5454
echo "git:*" | chpasswd -e
5555

5656
ENV USER git

Dockerfile.gitea.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.17-alpine3.15
1+
FROM golang:1.18-alpine3.16
22

33
ARG GOPROXY
44
ENV GOPROXY ${GOPROXY:-direct}

Dockerfile.rootless

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Build stage
2-
FROM golang:1.18-alpine3.15 AS build-env
2+
FROM golang:1.18-alpine3.16 AS build-env
33

44
ARG GOPROXY
55
ENV GOPROXY ${GOPROXY:-direct}
@@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
2323
# Begin env-to-ini build
2424
RUN go build contrib/environment-to-ini/environment-to-ini.go
2525

26-
FROM alpine:3.15
26+
FROM alpine:3.16
2727
LABEL maintainer="[email protected]"
2828

2929
EXPOSE 2222 3000

0 commit comments

Comments
 (0)