From 090c1d95fd6aa40d9c7224938b39a0d0ec2a62a0 Mon Sep 17 00:00:00 2001 From: Vivian Rook Date: Tue, 5 Nov 2024 14:40:01 -0500 Subject: [PATCH 1/2] Test image build --- images/jobber/Dockerfile | 2 +- images/nbserve/Dockerfile | 2 +- images/paws-hub/Dockerfile | 1 + images/renderer/Dockerfile | 2 +- images/singleuser/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/images/jobber/Dockerfile b/images/jobber/Dockerfile index 0f8b2da3..5f76caa9 100644 --- a/images/jobber/Dockerfile +++ b/images/jobber/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.20.0 - + RUN apk --no-cache add curl jq WORKDIR /opt/mediawiki diff --git a/images/nbserve/Dockerfile b/images/nbserve/Dockerfile index 18f84f57..7736113c 100644 --- a/images/nbserve/Dockerfile +++ b/images/nbserve/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:24.04 - + ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/images/paws-hub/Dockerfile b/images/paws-hub/Dockerfile index 3b735c6b..f67d49c2 100644 --- a/images/paws-hub/Dockerfile +++ b/images/paws-hub/Dockerfile @@ -1,4 +1,5 @@ FROM jupyterhub/k8s-hub:3.3.8 + ARG NB_USER=tools.paws ARG NB_UID=52771 ARG HOME=/home/paws diff --git a/images/renderer/Dockerfile b/images/renderer/Dockerfile index b740f5a3..05f939f4 100644 --- a/images/renderer/Dockerfile +++ b/images/renderer/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:24.04 - + RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ python3-pip \ diff --git a/images/singleuser/Dockerfile b/images/singleuser/Dockerfile index 61e87a2c..210e47de 100644 --- a/images/singleuser/Dockerfile +++ b/images/singleuser/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:24.04 - + ENV PYWIKIBOT_VERSION=9.5.0 ENV EDITOR=/bin/nano ENV PYWIKIBOT_DIR=/srv/paws From 595384929545bff929671529508712f07c6b482d Mon Sep 17 00:00:00 2001 From: Github Action Date: Tue, 5 Nov 2024 19:40:42 +0000 Subject: [PATCH 2/2] auto update of tag --- paws/values.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/paws/values.yaml b/paws/values.yaml index 273520ad..0ea8be1d 100644 --- a/paws/values.yaml +++ b/paws/values.yaml @@ -6,7 +6,7 @@ pawspublic: nbserve: image: name: quay.io/wikimedia-paws-prod/nbserve - tag: pr-419 # nbserve tag managed by github actions + tag: pr-461 # nbserve tag managed by github actions # pawspublic.nbserve.image.template safely defines image:tag name in yaml template: "{{ .Values.pawspublic.nbserve.image.name}}:{{.Values.pawspublic.nbserve.image.tag }}" replicas: 1 @@ -15,7 +15,7 @@ pawspublic: renderer: image: name: quay.io/wikimedia-paws-prod/renderer - tag: pr-418 # renderer tag managed by github actions + tag: pr-461 # renderer tag managed by github actions # pawspublic.nbserve.image.template safely defines image:tag name in yaml template: "{{ .Values.pawspublic.renderer.image.name}}:{{.Values.pawspublic.renderer.image.tag }}" requests: @@ -254,7 +254,7 @@ jupyterhub: fsGroup: 52771 image: name: quay.io/wikimedia-paws-prod/paws-hub - tag: pr-448 # paws-hub tag managed by github actions + tag: pr-461 # paws-hub tag managed by github actions containerSecurityContext: runAsUser: 52771 resources: @@ -280,7 +280,7 @@ jupyterhub: fsGid: 52771 image: name: quay.io/wikimedia-paws-prod/singleuser - tag: pr-459 # singleuser tag managed by github actions + tag: pr-461 # singleuser tag managed by github actions pullPolicy: Always memory: guarantee: 0.70G @@ -316,6 +316,6 @@ localdev: enabled: true image: name: quay.io/wikimedia-paws-prod/jobber - tag: pr-420 # jobber tag managed by github actions + tag: pr-461 # jobber tag managed by github actions # mediawikiHacks.image.template safely defines image:tag name in yaml template: "{{ .Values.localdev.image.name}}:{{.Values.localdev.image.tag }}"