opendev/system-config
Code Issues Proposed changes

Merge "Update Gitea images to bookworm"

Browse Source
This commit is contained in:
Zuul
2023-09-01 21:29:18 +00:00
committed by Gerrit Code Review
parent 90620b284b dea0930962
commit c91d217681
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docker/gitea/Dockerfile
View File

@@ -25,7 +25,7 @@
################################### ###################################
#Build stage #Build stage
FROM docker.io/library/golang:1.20-bullseye AS build-env FROM docker.io/library/golang:1.20-bookworm AS build-env
LABEL maintainer="infra-root@openstack.org" LABEL maintainer="infra-root@openstack.org"
@@ -35,7 +35,7 @@ ENV TAGS "bindata $TAGS"
#Build deps #Build deps
RUN apt-get update && apt-get -y install build-essential git apt-transport-https curl gnupg2 \ RUN apt-get update && apt-get -y install build-essential git apt-transport-https curl gnupg2 \
&& curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ && curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
&& echo "deb https://deb.nodesource.com/node_20.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list \ && echo "deb https://deb.nodesource.com/node_20.x bookworm main" | tee /etc/apt/sources.list.d/nodesource.list \
&& apt-get update \ && apt-get update \
&& apt-get -q --option "Dpkg::Options::=--force-confold" --assume-yes install nodejs \ && apt-get -q --option "Dpkg::Options::=--force-confold" --assume-yes install nodejs \
&& mkdir -p ${GOPATH}/src/code.gitea.io/gitea && mkdir -p ${GOPATH}/src/code.gitea.io/gitea
@@ -62,7 +62,7 @@ RUN chmod 755 gitea \
################################### ###################################
# Basic system setup common to all containers in our pod # Basic system setup common to all containers in our pod
FROM docker.io/library/debian:bullseye-slim as base FROM docker.io/library/debian:bookworm-slim as base
RUN apt-get update && apt-get -y install \ RUN apt-get update && apt-get -y install \
bash \ bash \
@@ -100,6 +100,11 @@ COPY custom/ /custom/
RUN --mount=type=bind,from=opendevorg/assets,target=/tmp/assets cp -r /tmp/assets/* /custom/public/img/ RUN --mount=type=bind,from=opendevorg/assets,target=/tmp/assets cp -r /tmp/assets/* /custom/public/img/
ENV GITEA_CUSTOM /custom ENV GITEA_CUSTOM /custom
# This is used the the openssh container image to set sshd_config AllowUsers
# even though that container runs as root (due to low port selection).
# The main gitea web container also uses this USER env var for basic user
# setup in its entrypoint.
ENV USER git
################################### ###################################
# The gitea image # The gitea image
@@ -110,7 +115,6 @@ RUN apt-get update && apt-get -y install pandoc \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
EXPOSE 3000 EXPOSE 3000
ENV USER git
VOLUME ["/data"] VOLUME ["/data"]
ENTRYPOINT ["/usr/bin/entrypoint"] ENTRYPOINT ["/usr/bin/entrypoint"]
CMD ["/usr/local/bin/gitea", "web"] CMD ["/usr/local/bin/gitea", "web"]