Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions docker/gitea/1/debian12/1.22/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BASE_REGISTRY="docker.io"
FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 as ospo
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0 as ospo

# Download Licenses and restricted source-code
COPY components.csv /components.csv
Expand All @@ -17,7 +17,7 @@ RUN mkdir -p /usr/src/licenses \
&& /download-ref-repos.sh /source_code.txt /usr/src

#Build stage
FROM docker.io/golang:bookworm AS build-env
FROM docker.io/library/golang:1.25-bookworm AS build-env

ARG GOPROXY
ENV GOPROXY ${GOPROXY:-direct}
Expand Down Expand Up @@ -49,7 +49,7 @@ RUN make clean-all build

# Begin env-to-ini build
RUN go build contrib/environment-to-ini/environment-to-ini.go
FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0

COPY --from=ospo /usr/src /usr/src

Expand All @@ -64,7 +64,9 @@ RUN apt-get update && \
openssh-server \
s6 \
sqlite3 \
gnupg
gnupg \
&& apt-get install -y --only-upgrade perl zlib1g \
&& rm -rf /var/lib/apt/lists/*

RUN ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1 \
&& ssh-keygen -A \
Expand Down
10 changes: 6 additions & 4 deletions docker/gitea/1/debian12/1.23/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BASE_REGISTRY="docker.io"
FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 as ospo
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0 as ospo

# Download Licenses and restricted source-code
COPY components.csv /components.csv
Expand All @@ -17,7 +17,7 @@ RUN mkdir -p /usr/src/licenses \
&& /download-ref-repos.sh /source_code.txt /usr/src

#Build stage
FROM docker.io/golang:bookworm AS build-env
FROM docker.io/library/golang:1.25-bookworm AS build-env

ARG GOPROXY
ENV GOPROXY ${GOPROXY:-direct}
Expand Down Expand Up @@ -49,7 +49,7 @@ RUN make clean-all build

# Begin env-to-ini build
RUN go build contrib/environment-to-ini/environment-to-ini.go
FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0

COPY --from=ospo /usr/src /usr/src

Expand All @@ -64,7 +64,9 @@ RUN apt-get update && \
openssh-server \
s6 \
sqlite3 \
gnupg
gnupg \
&& apt-get install -y --only-upgrade perl zlib1g \
&& rm -rf /var/lib/apt/lists/*

RUN ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1 \
&& ssh-keygen -A \
Expand Down
10 changes: 6 additions & 4 deletions docker/gitea/1/debian12/1.25/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BASE_REGISTRY="docker.io"
FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 as ospo
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0 as ospo

# Download Licenses and restricted source-code
COPY components.csv /components.csv
Expand All @@ -17,7 +17,7 @@ RUN mkdir -p /usr/src/licenses \
&& /download-ref-repos.sh /source_code.txt /usr/src

#Build stage
FROM docker.io/golang:bookworm AS build-env
FROM docker.io/library/golang:1.25-bookworm AS build-env

ARG GOPROXY
ENV GOPROXY ${GOPROXY:-direct}
Expand Down Expand Up @@ -49,7 +49,7 @@ RUN make clean-all build

# Begin env-to-ini build
RUN go build contrib/environment-to-ini/environment-to-ini.go
FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0

COPY --from=ospo /usr/src /usr/src

Expand All @@ -64,7 +64,9 @@ RUN apt-get update && \
openssh-server \
s6 \
sqlite3 \
gnupg
gnupg \
&& apt-get install -y --only-upgrade perl zlib1g \
&& rm -rf /var/lib/apt/lists/*

RUN ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1 \
&& ssh-keygen -A \
Expand Down
6 changes: 4 additions & 2 deletions docker/gitea/templates/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN mkdir -p /usr/src/licenses \
&& /download-ref-repos.sh /source_code.txt /usr/src

#Build stage
FROM docker.io/golang:bookworm AS build-env
FROM docker.io/library/golang:{{ $golang.Version }}-bookworm AS build-env

ARG GOPROXY
ENV GOPROXY ${GOPROXY:-direct}
Expand Down Expand Up @@ -68,7 +68,9 @@ RUN apt-get update && \
openssh-server \
s6 \
sqlite3 \
gnupg
gnupg \
&& apt-get install -y --only-upgrade perl zlib1g \
&& rm -rf /var/lib/apt/lists/*

RUN ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1 \
&& ssh-keygen -A \
Expand Down
12 changes: 6 additions & 6 deletions docker/gitea/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ versions:
- key: com.googleapis.cloudmarketplace.product.service.name
value: services/83c38401-9081-4bfd-8d88-f247f9c37ce9.cloudpartnerservices.goog
dir: 1/debian12/1.25
from: marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
from: marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0
packages:
gitea:
version: '1.25'
golang:
version: '1.23'
version: '1.25'
nodejs:
major: '22'
repo: gitea1
Expand All @@ -56,12 +56,12 @@ versions:
- key: com.googleapis.cloudmarketplace.product.service.name
value: services/83c38401-9081-4bfd-8d88-f247f9c37ce9.cloudpartnerservices.goog
dir: 1/debian12/1.23
from: marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
from: marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0
packages:
gitea:
version: '1.23'
golang:
version: '1.23'
version: '1.25'
nodejs:
major: '20'
repo: gitea1
Expand All @@ -82,12 +82,12 @@ versions:
- key: com.googleapis.cloudmarketplace.product.service.name
value: services/83c38401-9081-4bfd-8d88-f247f9c37ce9.cloudpartnerservices.goog
dir: 1/debian12/1.22
from: marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
from: marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0
packages:
gitea:
version: '1.22'
golang:
version: '1.23'
version: '1.25'
nodejs:
major: '20'
repo: gitea1
Expand Down
Loading