Skip to content

Commit

Permalink
Migrate some containers to ghcr.io
Browse files Browse the repository at this point in the history
Signed-off-by: Daichi Sakaue <[email protected]>
  • Loading branch information
yokaze committed Dec 22, 2023
1 parent b674691 commit f35d5a4
Show file tree
Hide file tree
Showing 14 changed files with 33 additions and 17 deletions.
2 changes: 0 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,6 @@ workflows:
- build:
name: build-alertmanager
container-image: alertmanager
scan: true
- build:
name: build-argocd
container-image: argocd
Expand All @@ -721,7 +720,6 @@ workflows:
- build:
name: build-blackbox_exporter
container-image: blackbox_exporter
scan: true
- build:
name: build-bmc-reverse-proxy
container-image: bmc-reverse-proxy
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ jobs:
strategy:
matrix:
job:
- dir: "./alertmanager"
container-image: "alertmanager"
scan: "true"
- dir: "./argocd"
container-image: "argocd"
scan: "true"
Expand All @@ -18,6 +21,9 @@ jobs:
- dir: "./bird"
container-image: "bird"
scan: "true"
- dir: "./blackbox_exporter"
container-image: "blackbox_exporter"
scan: "true"
- dir: "./bmc-reverse-proxy"
container-image: "bmc-reverse-proxy"
- dir: "./bpf-map-pressure-exporter"
Expand Down Expand Up @@ -92,6 +98,8 @@ jobs:
scan: "true"
- dir: "./memcached-exporter"
container-image: "memcached-exporter"
- dir: "./moco-switchover-downtime-monitor"
container-image: "moco-switchover-downtime-monitor"
- dir: "./opentelemetry-collector"
container-image: "opentelemetry-collector"
scan: "true"
Expand Down Expand Up @@ -135,6 +143,8 @@ jobs:
scan: "true"
- dir: "./sealed-secrets"
container-image: "sealed-secrets"
- dir: "./s3gw"
container-image: "s3gw"
- dir: "./serf"
container-image: "serf"
scan: "true"
Expand Down Expand Up @@ -166,6 +176,8 @@ jobs:
- dir: "./vault"
container-image: "vault"
scan: "true"
- dir: "./victoriametrics-operator"
container-image: "victoriametrics-operator"

runs-on: ubuntu-22.04
env:
Expand Down
5 changes: 3 additions & 2 deletions alertmanager/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Alertmanager container

# 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 ALERTMANAGER_VERSION=0.26.0

Expand All @@ -16,7 +16,8 @@ RUN curl -fsSL -o alertmanager.tar.gz "https://github.com/prometheus/alertmanage
&& make "PREFIX=$GOPATH/bin/alertmanager" build

# Stage2: setup runtime container
FROM quay.io/cybozu/ubuntu:22.04
FROM ghcr.io/cybozu/ubuntu:22.04
LABEL org.opencontainers.image.source="https://github.com/cybozu/neco-containers"

COPY --from=build /go/bin/alertmanager /bin
COPY --from=build /go/src/github.com/prometheus/alertmanager/LICENSE /
Expand Down
4 changes: 2 additions & 2 deletions alertmanager/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ $ docker run -d --read-only --cap-drop ALL --cap-add NET_BIND_SERVICE \
--mount type=bind,source=/data,target=/data \
--mount type=bind,source=/config,target=/config \
--entrypoint alertmanager \
quay.io/cybozu/alertmanager:0.24 \
ghcr.io/cybozu/alertmanager:0.24 \
--config.file=/config/alertmanager.yaml
```

## Docker images

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/alertmanager)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/alertmanager)
2 changes: 1 addition & 1 deletion alertmanager/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.26.0.1
0.26.0.2
6 changes: 4 additions & 2 deletions blackbox_exporter/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# blackbox-exporter container

# 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 BLACKBOX_EXPORTER_VERSION=0.24.0
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
Expand All @@ -12,7 +12,9 @@ RUN curl -fsSL https://github.com/prometheus/blackbox_exporter/archive/v${BLACKB
RUN make build

# Stage2: setup runtime container
FROM quay.io/cybozu/ubuntu:22.04
FROM ghcr.io/cybozu/ubuntu:22.04
LABEL org.opencontainers.image.source="https://github.com/cybozu/neco-containers"

COPY --from=build /blackbox_exporter/blackbox_exporter /blackbox_exporter
COPY --from=build /blackbox_exporter/blackbox.yml /blackbox.yml
COPY --from=build /blackbox_exporter/LICENSE /LICENSE
Expand Down
2 changes: 1 addition & 1 deletion blackbox_exporter/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.24.0.2
0.24.0.3
3 changes: 2 additions & 1 deletion moco-switchover-downtime-monitor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/cybozu/golang:1.21-jammy AS build
FROM ghcr.io/cybozu/golang:1.21-jammy AS build

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

Expand All @@ -8,6 +8,7 @@ WORKDIR /work
RUN CGO_ENABLED=0 go build ./...

FROM scratch
LABEL org.opencontainers.image.source="https://github.com/cybozu/neco-containers"

COPY --from=build /work/moco-switchover-downtime-monitor /moco-switchover-downtime-monitor
# Note that this container image does not include kubectl and kubectl-moco.
Expand Down
2 changes: 1 addition & 1 deletion moco-switchover-downtime-monitor/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.1
1.0.2
3 changes: 2 additions & 1 deletion s3gw/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# s3gw container

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

COPY . /work

Expand All @@ -11,6 +11,7 @@ RUN CGO_ENABLED=0 go install -ldflags="-w -s" .

# Stage2: setup runtime container
FROM scratch
LABEL org.opencontainers.image.source="https://github.com/cybozu/neco-containers"

COPY --from=build /go/bin /

Expand Down
2 changes: 1 addition & 1 deletion s3gw/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.9
1.0.10
3 changes: 2 additions & 1 deletion victoriametrics-operator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# victoriametrics-operator container

# 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 VICTORIAMETRICS_OPERATOR_SRCREPO=VictoriaMetrics/operator
ARG VICTORIAMETRICS_OPERATOR_VERSION=0.39.1
Expand All @@ -18,6 +18,7 @@ RUN curl -fsSL -o victoriametrics-operator.tar.gz "https://github.com/${VICTORIA

# Stage2: setup runtime container
FROM scratch
LABEL org.opencontainers.image.source="https://github.com/cybozu/neco-containers"

COPY --from=build /go/src/github.com/VictoriaMetrics/operator/bin/manager /
COPY --from=build /go/src/github.com/VictoriaMetrics/operator/LICENSE /
Expand Down
2 changes: 1 addition & 1 deletion victoriametrics-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Kubernetes operator for VictoriaMetrics
Docker images
-------------

Docker images are available on [Quay.io](https://quay.io/repository/cybozu/victoriametrics-operator)
Docker images are available on [ghcr.io](https://github.com/cybozu/neco-containers/pkgs/container/victoriametrics-operator)
2 changes: 1 addition & 1 deletion victoriametrics-operator/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.39.1.1
0.39.1.2

0 comments on commit f35d5a4

Please sign in to comment.