Skip to content

Commit

Permalink
Migrate to ghcr
Browse files Browse the repository at this point in the history
Issue: UTAPI-99
(cherry picked from commit c4e786d)
  • Loading branch information
francoisferrand authored and BourgoisMickael committed May 27, 2024
1 parent 6c6ef67 commit 239f653
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 30 deletions.
3 changes: 1 addition & 2 deletions .github/docker/vault/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
FROM registry.scality.com/vault-dev/vault:c2607856
FROM ghcr.io/scality/vault:c2607856

ENV VAULT_DB_BACKEND LEVELDB

RUN chmod 400 tests/utils/keyfile

ENTRYPOINT yarn start

20 changes: 4 additions & 16 deletions .github/workflows/build-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,13 @@ name: build-ci-images

on:
workflow_call:
secrets:
REGISTRY_LOGIN:
required: true
REGISTRY_PASSWORD:
required: true

jobs:
warp10-ci:
uses: scality/workflows/.github/workflows/docker-build.yaml@v1
secrets:
REGISTRY_LOGIN: ${{ github.repository_owner }}
REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
REGISTRY_PASSWORD: ${{ github.token }}
with:
name: warp10-ci
context: .
Expand All @@ -24,7 +19,7 @@ jobs:
uses: scality/workflows/.github/workflows/docker-build.yaml@v1
secrets:
REGISTRY_LOGIN: ${{ github.repository_owner }}
REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
REGISTRY_PASSWORD: ${{ github.token }}
with:
name: redis-ci
context: .
Expand All @@ -36,7 +31,7 @@ jobs:
- redis-ci
secrets:
REGISTRY_LOGIN: ${{ github.repository_owner }}
REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
REGISTRY_PASSWORD: ${{ github.token }}
with:
name: redis-replica-ci
context: .github/docker/redis-replica
Expand All @@ -58,14 +53,7 @@ jobs:
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Login to Scality Registry
uses: docker/[email protected]
with:
registry: registry.scality.com
username: ${{ secrets.REGISTRY_LOGIN }}
password: ${{ secrets.REGISTRY_PASSWORD }}
password: ${{ github.token }}

- name: Build and push vault Image
uses: docker/[email protected]
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/build-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ on:
jobs:
build-dev:
uses: scality/workflows/.github/workflows/docker-build.yaml@v1
secrets: inherit
secrets:
REGISTRY_LOGIN: ${{ github.repository_owner }}
REGISTRY_PASSWORD: ${{ github.token }}
with:
registry: registry.scality.com
namespace: utapi-dev
name: utapi
namespace: ${{ github.repository_owner }}
name: ${{ github.event.repository.name }}
4 changes: 1 addition & 3 deletions .github/workflows/release-warp10.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ jobs:
uses: scality/workflows/.github/workflows/docker-build.yaml@v1
secrets: inherit
with:
registry: registry.scality.com
namespace: utapi
name: warp10
context: .
file: images/warp10/Dockerfile
Expand All @@ -35,7 +33,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
name: Release registry.scality.com/utapi/warp10:${{ github.event.inputs.tag }}-warp10
name: Release utapi/warp10:${{ github.event.inputs.tag }}-warp10
tag_name: ${{ github.event.inputs.tag }}-warp10
generate_release_notes: false
target_commitish: ${{ github.sha }}
3 changes: 0 additions & 3 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ on:
jobs:
build-ci:
uses: ./.github/workflows/build-ci.yaml
secrets:
REGISTRY_LOGIN: ${{ secrets.REGISTRY_LOGIN }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}

lint:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion images/nodesvc-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.scality.com/federation/nodesvc-base:7.10.5.0
FROM ghcr.io/scality/federation/nodesvc-base:7.10.5.0

ENV UTAPI_CONFIG_FILE=${CONF_DIR}/config.json

Expand Down
2 changes: 1 addition & 1 deletion images/warp10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN apk add zip unzip build-base \
&& cd .. \
&& go build -a -o /usr/local/go/warp10_sensision_exporter

FROM registry.scality.com/utapi/warp10:2.8.1-95-g73e7de80
FROM ghcr.io/scality/utapi/warp10:2.8.1-95-g73e7de80

# Override baked in version
# Remove when updating to a numbered release
Expand Down

0 comments on commit 239f653

Please sign in to comment.