Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate some containers to ghcr.io
Browse files Browse the repository at this point in the history
Signed-off-by: Daichi Sakaue <daichi-sakaue@cybozu.co.jp>
yokaze committed Dec 5, 2023
1 parent 70256aa commit 17c7d71
Showing 23 changed files with 51 additions and 41 deletions.
2 changes: 0 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -760,7 +760,6 @@ workflows:
- build:
name: build-chrony
container-image: chrony
scan: true
- build-cilium-envoy:
version: ad831bdec4c93feeb2378aa9e1847c936ada6ef7
- build-cilium-image-tools:
@@ -824,7 +823,6 @@ workflows:
- build:
name: build-external-dns
container-image: external-dns
scan: true
- buildx:
name: build-golang-1.20-focal
container-image: golang
26 changes: 19 additions & 7 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
@@ -9,15 +9,31 @@ jobs:
strategy:
matrix:
job:
- dir: "./argocd-image-updater"
container-image: "argocd-image-updater"
scan: "true"
- dir: "./bird"
container-image: "bird"
scan: "true"
- dir: "./bpf-map-pressure-exporter"
container-image: "bpf-map-pressure-exporter"
scan: "true"
make_test: true
- dir: "./chrony"
container-image: "chrony"
scan: "true"
- dir: "./contour"
container-image: "contour"
scan: "true"
- dir: "./coredns"
container-image: "coredns"
scan: "true"
- dir: "./etcd"
container-image: "etcd"
scan: "true"
- dir: "./external-dns"
container-image: "external-dns"
scan: "true"
- dir: "./fluent-bit"
container-image: "fluent-bit"
scan: "true"
@@ -48,6 +64,9 @@ jobs:
- dir: "./pod-delete-rate-limiter"
container-image: "pod-delete-rate-limiter"
make_test: true
- dir: "./sealed-secrets"
container-image: "sealed-secrets"
scan: "true"
- dir: "./serf"
container-image: "serf"
scan: "true"
@@ -70,13 +89,6 @@ jobs:
- dir: "./vault"
container-image: "vault"
scan: "true"
- dir: "./bpf-map-pressure-exporter"
container-image: "bpf-map-pressure-exporter"
scan: "true"
make_test: true
- dir: "./argocd-image-updater"
container-image: "argocd-image-updater"
scan: "true"

runs-on: ubuntu-22.04
env:
4 changes: 2 additions & 2 deletions bird/README.md
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ $ docker run -d --read-only --cap-drop ALL \
--network host --name bird \
--mount type=tmpfs,destination=/run/bird \
--mount type=bind,source=/your/bird.conf,target=/etc/bird/bird.conf \
quay.io/cybozu/bird:2.14
ghcr.io/cybozu/bird:2.14
```

### Use client tools
@@ -73,4 +73,4 @@ Daemon is up and running
Docker images
-------------

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/bird)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/bird)
4 changes: 2 additions & 2 deletions chrony/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# chrony container

# Stage1: build from source
FROM quay.io/cybozu/ubuntu-dev:22.04 AS build
FROM ghcr.io/cybozu/ubuntu-dev:22.04 AS build
ARG CHRONY_VERSION=4.4

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -20,7 +20,7 @@ RUN ./configure --exec-prefix=/usr/local/chrony --with-pidfile=/run/chrony/chron


# Stage2: setup runtime container
FROM quay.io/cybozu/ubuntu:22.04
FROM ghcr.io/cybozu/ubuntu:22.04

RUN apt-get update \
&& apt-get install -y --no-install-recommends libedit2 \
4 changes: 2 additions & 2 deletions chrony/README.md
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ Usage
--cap-drop ALL \
--cap-add SYS_TIME \
--cap-add NET_BIND_SERVICE \
quay.io/cybozu/chrony:4.4
ghcr.io/cybozu/chrony:4.4
```

### Use `chronyc`
@@ -39,4 +39,4 @@ $ docker exec -it chrony chronyc tracking
Docker images
-------------

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/chrony)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/chrony)
2 changes: 1 addition & 1 deletion chrony/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.4.0.1
4.4.0.2
2 changes: 1 addition & 1 deletion contour/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Contour container image

# Stage1: build from source
FROM quay.io/cybozu/golang:1.21-jammy AS build
FROM ghcr.io/cybozu/golang:1.21-jammy AS build

ARG CONTOUR_VERSION=1.27.0

4 changes: 2 additions & 2 deletions contour/README.md
Original file line number Diff line number Diff line change
@@ -12,12 +12,12 @@ Run the container

```console
$ docker run -d --read-only --name=contour \
quay.io/cybozu/contour:1.27.0 serve
ghcr.io/cybozu/contour:1.27.0 serve
```

[Contour]: https://github.com/heptio/contour

Docker images
-------------

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/contour)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/contour)
2 changes: 1 addition & 1 deletion contour/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.27.0.1
1.27.0.2
4 changes: 2 additions & 2 deletions external-dns/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ExternalDNS container image

# Stage1: build from source
FROM quay.io/cybozu/golang:1.21-jammy AS build
FROM ghcr.io/cybozu/golang:1.21-jammy AS build

ARG EXTERNALDNS_VERSION=0.14.0

@@ -15,7 +15,7 @@ WORKDIR /work/external-dns/
RUN make build

# Stage2: setup runtime container
FROM quay.io/cybozu/ubuntu:22.04
FROM ghcr.io/cybozu/ubuntu:22.04

COPY --from=build /work/external-dns/build/external-dns /usr/local/external-dns/bin/external-dns
COPY --from=build /work/external-dns/LICENSE /usr/local/external-dns/LICENSE
4 changes: 2 additions & 2 deletions external-dns/README.md
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ Run the container

```console
$ docker run -d --read-only --name=external-dns \
quay.io/cybozu/external-dns:0.14.0.1 \
ghcr.io/cybozu/external-dns:0.14.0.1 \
--registry=txt --txt-owner-id ... --provider ...
```

@@ -22,4 +22,4 @@ $ docker run -d --read-only --name=external-dns \
Docker images
-------------

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/external-dns)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/external-dns)
2 changes: 1 addition & 1 deletion external-dns/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.14.0.1
0.14.0.2
2 changes: 1 addition & 1 deletion golang-all/golang-1.20-focal/README.md
Original file line number Diff line number Diff line change
@@ -16,4 +16,4 @@ This container is based on [ghcr.io/cybozu/ubuntu-dev](https://ghcr.io/repositor
Docker images
-------------

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/golang)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/golang)
2 changes: 1 addition & 1 deletion golang-all/golang-1.20-jammy/README.md
Original file line number Diff line number Diff line change
@@ -16,4 +16,4 @@ This container is based on [ghcr.io/cybozu/ubuntu-dev](https://ghcr.io/repositor
Docker images
-------------

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/golang)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/golang)
2 changes: 1 addition & 1 deletion golang-all/golang-1.21-focal/README.md
Original file line number Diff line number Diff line change
@@ -16,4 +16,4 @@ This container is based on [ghcr.io/cybozu/ubuntu-dev](https://ghcr.io/repositor
Docker images
-------------

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/golang)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/golang)
2 changes: 1 addition & 1 deletion golang-all/golang-1.21-jammy/README.md
Original file line number Diff line number Diff line change
@@ -16,4 +16,4 @@ This container is based on [ghcr.io/cybozu/ubuntu-dev](https://ghcr.io/repositor
Docker images
-------------

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/golang)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/golang)
2 changes: 1 addition & 1 deletion sealed-secrets/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build stage
FROM quay.io/cybozu/golang:1.21-jammy AS build
FROM ghcr.io/cybozu/golang:1.21-jammy AS build

ARG SEALED_SECRETS_VERSION=0.24.3

2 changes: 1 addition & 1 deletion sealed-secrets/README.md
Original file line number Diff line number Diff line change
@@ -6,4 +6,4 @@ This directory provides a Dockerfile to build a Docker container for [sealed-sec
Docker images
-------------

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/sealed-secrets)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/sealed-secrets)
2 changes: 1 addition & 1 deletion sealed-secrets/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.24.3.1
0.24.3.2
6 changes: 3 additions & 3 deletions serf/README.md
Original file line number Diff line number Diff line change
@@ -26,15 +26,15 @@ To launch serf server by `docker run`:
$ docker run -d --rm --read-only --name serf \
--mount type=bind,source=/your/config,target=/serf/config \
-p 7373:7373 -p 7946:7946 \
quay.io/cybozu/serf:0.10 \
ghcr.io/cybozu/serf:0.10 \
agent -config-dir=/serf/config

To use serf cli, first install it in a host OS directory `DIR`:

$ docker run --rm -u root:root \
--entrypoint /usr/local/serf/install-tools \
--mount type=bind,source=DIR,target=/host \
quay.io/cybozu/serf:0.10
ghcr.io/cybozu/serf:0.10

Then run `serf` as follows:

@@ -43,4 +43,4 @@ Then run `serf` as follows:
Docker images
-------------

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/serf)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/serf)
6 changes: 3 additions & 3 deletions squid/README.md
Original file line number Diff line number Diff line change
@@ -6,14 +6,14 @@

### Run with the default configuration

$ docker run -d --read-only quay.io/cybozu/squid:6
$ docker run -d --read-only ghcr.io/cybozu/squid:6
### Launch Squid with specific config file

Prepare `squid.conf`, then execute following command.

$ docker run -d --read-only \
-v /path/to/your/squid.conf:/etc/squid/squid.conf:ro \
quay.io/cybozu/squid:6
ghcr.io/cybozu/squid:6

Your `squid.conf` must have the following configurations:

@@ -24,4 +24,4 @@ Your `squid.conf` must have the following configurations:

## Docker images

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/squid)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/squid)
4 changes: 2 additions & 2 deletions unbound/README.md
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@
Prepare config file `unbound.conf` at working directory, then execute following command.

$ docker run --mount type=bind,source="$(pwd)"/unbound.conf,target=/etc/unbound.conf \
quay.io/cybozu/unbound:1.18 -c /etc/unbound.conf
ghcr.io/cybozu/unbound:1.18 -c /etc/unbound.conf

## Docker images

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/unbound)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/unbound)
2 changes: 1 addition & 1 deletion vault/README.md
Original file line number Diff line number Diff line change
@@ -41,4 +41,4 @@ Then run `vault` as follows:
Docker images
-------------

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/vault)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/vault)

0 comments on commit 17c7d71

Please sign in to comment.