Skip to content

Commit 8615ed7

Browse files
committed
Migrate from dockerhub to ghcr.io
1 parent 34754a5 commit 8615ed7

File tree

5 files changed

+21
-12
lines changed

5 files changed

+21
-12
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1866,7 +1866,7 @@ jobs:
18661866
command: scripts/docker_deploy_manual.sh develop "file://$PWD" --no-push
18671867
- run:
18681868
name: Smoke test
1869-
command: docker run --pull=never ethereum/solc:build-alpine --version
1869+
command: docker run --pull=never ghcr.io/argotorg/solc:build-alpine --version
18701870
- matrix_notify_failure_unless_pr
18711871

18721872
workflows:

.github/workflows/buildpack-deps.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ jobs:
1616
buildpack-deps:
1717
env:
1818
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19-
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
20-
DOCKER_REPOSITORY: solbuildpackpusher/solidity-buildpack-deps
19+
DOCKER_REPOSITORY: ghcr.io/argotorg/solidity-buildpack-deps
2120
IMAGE_NAME: buildpack-deps
2221

2322
runs-on: ubuntu-latest
@@ -32,11 +31,16 @@ jobs:
3231
with:
3332
fetch-depth: 0
3433

34+
- name: Log in to GitHub Container Registry
35+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
36+
with:
37+
registry: ghcr.io
38+
username: ${{ github.actor }}
39+
password: ${{ secrets.GITHUB_TOKEN }}
40+
3541
- name: Upgrade ${{ env.IMAGE_NAME }}-${{ matrix.image_variant }}
3642
run: |
37-
echo ${DOCKERHUB_TOKEN} | docker login -u solbuildpackpusher --password-stdin
3843
scripts/ci/docker_upgrade.sh ${{ env.IMAGE_NAME }} ${{ matrix.image_variant }} ${{ env.DOCKER_REPOSITORY }}
39-
docker logout
4044
4145
- name: comment PR
4246
if: "env.DOCKER_IMAGE"

scripts/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
FROM alpine AS build
2-
MAINTAINER chriseth <[email protected]>
3-
#Official solidity docker image
42

53
#Establish working directory as solidity
64
WORKDIR /solidity
75

86
# Build dependencies
97
RUN apk update && apk add boost-dev boost-static build-base cmake git clang
108

11-
#Copy working directory on travis to the image
12-
COPY / $WORKDIR
9+
#Copy working directory to the image
10+
COPY . /solidity
1311

1412
# Number of parallel jobs during build
1513
# or 0 for auto-computing (max(1, CPU_core_count * 2/3), a greedy value)
@@ -34,5 +32,7 @@ RUN make solc \
3432
RUN strip solc/solc
3533

3634
FROM scratch
35+
LABEL org.opencontainers.image.source=https://github.com/argotorg/solidity
36+
LABEL maintainer="Solidity Team <[email protected]>"
3737
COPY --from=build /solidity/solc/solc /usr/bin/solc
3838
ENTRYPOINT ["/usr/bin/solc"]

scripts/Dockerfile_alpine

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
FROM alpine
2-
MAINTAINER chriseth <[email protected]>
2+
LABEL org.opencontainers.image.source=https://github.com/argotorg/solidity
3+
LABEL maintainer="Solidity Team <[email protected]>"
34

45
COPY upload/solc-static-linux /usr/local/bin/solc
56
ENTRYPOINT ["/usr/local/bin/solc"]

scripts/docker_deploy_manual.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ REPO_ROOT="$(dirname "$0")/.."
66
# shellcheck source=scripts/common.sh
77
source "${REPO_ROOT}/scripts/common.sh"
88

9-
image="ethereum/solc"
9+
image="ghcr.io/argotorg/solc"
1010

1111
if (( $# < 1 || $# > 3 )); then
1212
fail "Usage: $0 <tag/branch> [repo URL] [--no-push]"
@@ -22,7 +22,11 @@ else
2222
publish=true
2323
fi
2424

25-
#docker login
25+
# NOTE: Login to GHCR before running this script with a PAT:
26+
# echo $GHCR_TOKEN | docker login ghcr.io -u USERNAME --password-stdin
27+
#
28+
# Create a classic PAT with write:packages scope only visiting the following url:
29+
# https://github.com/settings/tokens/new?scopes=write:packages
2630

2731
DIR=$(mktemp -d)
2832
(

0 commit comments

Comments
 (0)