Skip to content

Commit

Permalink
Merge pull request #635 from cybozu-go/migrate-to-ghcr
Browse files Browse the repository at this point in the history
Migrate to ghcr.io
  • Loading branch information
yokaze authored Jan 15, 2024
2 parents 1338c63 + 4bbfcab commit a7352fa
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions containers/fluent-bit/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Fluent Bit container image

# Stage1: build from source
FROM quay.io/cybozu/ubuntu-dev:22.04 AS builder
FROM ghcr.io/cybozu/ubuntu-dev:22.04 AS builder

ARG FLUENT_BIT_VERSION=2.2.0

Expand Down Expand Up @@ -64,7 +64,7 @@ RUN cmake -DFLB_RELEASE=On \
&& cp LICENSE /fluent-bit/

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

COPY --from=builder /fluent-bit /fluent-bit

Expand Down
4 changes: 2 additions & 2 deletions containers/mysql/8.0.18/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/cybozu/ubuntu-dev:20.04 AS builder
FROM ghcr.io/cybozu/ubuntu-dev:20.04 AS builder

ARG MYSQL_VERSION=8.0.18

Expand All @@ -20,7 +20,7 @@ RUN cd tmp/ \
&& make -j 20 \
&& make install

FROM quay.io/cybozu/ubuntu:20.04
FROM ghcr.io/cybozu/ubuntu:20.04

COPY --from=builder /usr/local/mysql/LICENSE /usr/local/mysql/LICENSE
COPY --from=builder /usr/local/mysql/bin /usr/local/mysql/bin
Expand Down
4 changes: 2 additions & 2 deletions containers/mysql/8.0.25/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/cybozu/ubuntu-dev:20.04 AS builder
FROM ghcr.io/cybozu/ubuntu-dev:20.04 AS builder

ARG MYSQL_VERSION=8.0.25

Expand All @@ -20,7 +20,7 @@ RUN cd tmp/ \
&& make -j 20 \
&& make install

FROM quay.io/cybozu/ubuntu:20.04
FROM ghcr.io/cybozu/ubuntu:20.04

COPY --from=builder /usr/local/mysql/LICENSE /usr/local/mysql/LICENSE
COPY --from=builder /usr/local/mysql/bin /usr/local/mysql/bin
Expand Down
4 changes: 2 additions & 2 deletions containers/mysql/8.0.26/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/cybozu/ubuntu-dev:20.04 AS builder
FROM ghcr.io/cybozu/ubuntu-dev:20.04 AS builder

ARG MYSQL_VERSION=8.0.26

Expand All @@ -20,7 +20,7 @@ RUN cd tmp/ \
&& make -j 20 \
&& make install

FROM quay.io/cybozu/ubuntu:20.04
FROM ghcr.io/cybozu/ubuntu:20.04

COPY --from=builder /usr/local/mysql/LICENSE /usr/local/mysql/LICENSE
COPY --from=builder /usr/local/mysql/bin /usr/local/mysql/bin
Expand Down
4 changes: 2 additions & 2 deletions containers/mysql/8.0.27/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/cybozu/ubuntu-dev:20.04 AS builder
FROM ghcr.io/cybozu/ubuntu-dev:20.04 AS builder

ARG MYSQL_VERSION=8.0.27

Expand All @@ -20,7 +20,7 @@ RUN cd tmp/ \
&& make -j 20 \
&& make install

FROM quay.io/cybozu/ubuntu:20.04
FROM ghcr.io/cybozu/ubuntu:20.04

COPY --from=builder /usr/local/mysql/LICENSE /usr/local/mysql/LICENSE
COPY --from=builder /usr/local/mysql/bin /usr/local/mysql/bin
Expand Down
4 changes: 2 additions & 2 deletions containers/mysql/8.0.28/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/cybozu/ubuntu-dev:20.04 AS builder
FROM ghcr.io/cybozu/ubuntu-dev:20.04 AS builder

ARG MYSQL_VERSION=8.0.28

Expand All @@ -20,7 +20,7 @@ RUN cd tmp/ \
&& make -j 20 \
&& make install

FROM quay.io/cybozu/ubuntu:20.04
FROM ghcr.io/cybozu/ubuntu:20.04

COPY --from=builder /usr/local/mysql/LICENSE /usr/local/mysql/LICENSE
COPY --from=builder /usr/local/mysql/bin /usr/local/mysql/bin
Expand Down
4 changes: 2 additions & 2 deletions containers/mysql/8.0.30/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/cybozu/ubuntu-dev:20.04 AS builder
FROM ghcr.io/cybozu/ubuntu-dev:20.04 AS builder

ARG MYSQL_VERSION=8.0.30

Expand All @@ -20,7 +20,7 @@ RUN cd tmp/ \
&& make -j 20 \
&& make install

FROM quay.io/cybozu/ubuntu:20.04
FROM ghcr.io/cybozu/ubuntu:20.04

COPY --from=builder /usr/local/mysql/LICENSE /usr/local/mysql/LICENSE
COPY --from=builder /usr/local/mysql/bin /usr/local/mysql/bin
Expand Down
4 changes: 2 additions & 2 deletions containers/mysql/8.0.31/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/cybozu/ubuntu-dev:20.04 AS builder
FROM ghcr.io/cybozu/ubuntu-dev:20.04 AS builder

ARG MYSQL_VERSION=8.0.31

Expand All @@ -20,7 +20,7 @@ RUN cd tmp/ \
&& make -j 20 \
&& make install

FROM quay.io/cybozu/ubuntu:20.04
FROM ghcr.io/cybozu/ubuntu:20.04

COPY --from=builder /usr/local/mysql/LICENSE /usr/local/mysql/LICENSE
COPY --from=builder /usr/local/mysql/bin /usr/local/mysql/bin
Expand Down
4 changes: 2 additions & 2 deletions containers/mysql/8.0.32/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/cybozu/ubuntu-dev:20.04 AS builder
FROM ghcr.io/cybozu/ubuntu-dev:20.04 AS builder

ARG MYSQL_VERSION=8.0.32

Expand All @@ -20,7 +20,7 @@ RUN cd tmp/ \
&& make -j 20 \
&& make install

FROM quay.io/cybozu/ubuntu:20.04
FROM ghcr.io/cybozu/ubuntu:20.04

COPY --from=builder /usr/local/mysql/LICENSE /usr/local/mysql/LICENSE
COPY --from=builder /usr/local/mysql/bin /usr/local/mysql/bin
Expand Down
4 changes: 2 additions & 2 deletions containers/mysql/8.0.33/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/cybozu/ubuntu-dev:22.04 AS builder
FROM ghcr.io/cybozu/ubuntu-dev:22.04 AS builder

ARG MYSQL_VERSION=8.0.33

Expand All @@ -20,7 +20,7 @@ RUN cd tmp/ \
&& make -j 20 \
&& make install

FROM quay.io/cybozu/ubuntu:22.04
FROM ghcr.io/cybozu/ubuntu:22.04

COPY --from=builder /usr/local/mysql/LICENSE /usr/local/mysql/LICENSE
COPY --from=builder /usr/local/mysql/bin /usr/local/mysql/bin
Expand Down
4 changes: 2 additions & 2 deletions containers/mysql/8.0.34/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/cybozu/ubuntu-dev:22.04 AS builder
FROM ghcr.io/cybozu/ubuntu-dev:22.04 AS builder

ARG MYSQL_VERSION=8.0.34

Expand All @@ -20,7 +20,7 @@ RUN cd tmp/ \
&& make -j 20 \
&& make install

FROM quay.io/cybozu/ubuntu:22.04
FROM ghcr.io/cybozu/ubuntu:22.04

COPY --from=builder /usr/local/mysql/LICENSE /usr/local/mysql/LICENSE
COPY --from=builder /usr/local/mysql/bin /usr/local/mysql/bin
Expand Down
4 changes: 2 additions & 2 deletions containers/mysql/8.0.35/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/cybozu/ubuntu-dev:22.04 AS builder
FROM ghcr.io/cybozu/ubuntu-dev:22.04 AS builder

ARG MYSQL_VERSION=8.0.35

Expand All @@ -20,7 +20,7 @@ RUN cd tmp/ \
&& make -j 20 \
&& make install

FROM quay.io/cybozu/ubuntu:22.04
FROM ghcr.io/cybozu/ubuntu:22.04

COPY --from=builder /usr/local/mysql/LICENSE /usr/local/mysql/LICENSE
COPY --from=builder /usr/local/mysql/bin /usr/local/mysql/bin
Expand Down
2 changes: 1 addition & 1 deletion containers/mysqld_exporter/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# mysqld_exporter container

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

ARG MYSQLD_EXPORTER_VERSION=v0.15.0

Expand Down

0 comments on commit a7352fa

Please sign in to comment.