diff --git a/.github/docker/vault/Dockerfile b/.github/docker/vault/Dockerfile index 3e2478c9..976af0ce 100644 --- a/.github/docker/vault/Dockerfile +++ b/.github/docker/vault/Dockerfile @@ -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 - diff --git a/.github/workflows/build-ci.yaml b/.github/workflows/build-ci.yaml index 3310cec5..a687e006 100644 --- a/.github/workflows/build-ci.yaml +++ b/.github/workflows/build-ci.yaml @@ -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: . @@ -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: . @@ -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 @@ -58,14 +53,7 @@ jobs: with: registry: ghcr.io username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Login to Scality Registry - uses: docker/login-action@v1.10.0 - with: - registry: registry.scality.com - username: ${{ secrets.REGISTRY_LOGIN }} - password: ${{ secrets.REGISTRY_PASSWORD }} + password: ${{ github.token }} - name: Build and push vault Image uses: docker/build-push-action@v2.7.0 diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index c6e83638..97ead80f 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -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 }} diff --git a/.github/workflows/release-warp10.yaml b/.github/workflows/release-warp10.yaml index 3da6baab..644fd668 100644 --- a/.github/workflows/release-warp10.yaml +++ b/.github/workflows/release-warp10.yaml @@ -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 @@ -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 }} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 664a962f..cab6e4de 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -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 diff --git a/images/nodesvc-base/Dockerfile b/images/nodesvc-base/Dockerfile index 8ac6ed0d..2f0fb3b6 100644 --- a/images/nodesvc-base/Dockerfile +++ b/images/nodesvc-base/Dockerfile @@ -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 diff --git a/images/warp10/Dockerfile b/images/warp10/Dockerfile index d12feee0..c068914f 100644 --- a/images/warp10/Dockerfile +++ b/images/warp10/Dockerfile @@ -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