Ubuntu 22.04 (#45)

Signed-off-by: Masayuki Ishii <[email protected]>

.github/workflows/ci.yaml

@@ -8,13 +8,13 @@ env:
   cache-version: 1
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
     - run: make docker-build
   test:
     name: Small tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-go@v3
@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         k8s-version: ["1.23.13", "1.24.7", "1.25.3"]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-go@v3

.github/workflows/release.yaml

@@ -6,7 +6,7 @@ on:
 jobs:
   image:
     name: Push Container image
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: docker/setup-buildx-action@v1
@@ -27,7 +27,7 @@ jobs:
   release:
     name: Release on GitHub
     needs: image
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Create release

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM quay.io/cybozu/golang:1.19-focal as builder
+FROM quay.io/cybozu/golang:1.19-jammy as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -19,7 +19,7 @@ COPY pkg/ pkg/
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager cmd/nyamber-controller/main.go
 
-FROM quay.io/cybozu/ubuntu:20.04
+FROM quay.io/cybozu/ubuntu:22.04
 LABEL org.opencontainers.image.source https://github.com/cybozu-go/nyamber
 
 WORKDIR /

Dockerfile.runner

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM quay.io/cybozu/golang:1.19-focal as builder
+FROM quay.io/cybozu/golang:1.19-jammy as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
     CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o entrypoint cmd/entrypoint/main.go
 
-FROM quay.io/cybozu/ubuntu:20.04
+FROM quay.io/cybozu/ubuntu:22.04
 LABEL org.opencontainers.image.source https://github.com/cybozu-go/nyamber
 
 ENV GO_VERSION=1.19.5
@@ -36,9 +36,6 @@ ENV NECO_APPS_DIR=${GOPATH}/src/github.com/cybozu-private/neco-apps
 COPY include-bird /etc/dpkg/dpkg.cfg.d/
 
 RUN apt-get update \
-    && apt-get install -y software-properties-common \
-    && add-apt-repository -y ppa:smoser/swtpm \
-    && apt-get update \
     && apt-get -y install --no-install-recommends \
             git \
             build-essential \