Skip to content

Commit 93d3f87

Browse files
authored
[ENHANCEMENT] CI: Configure a separate docker registry for dev images (#5172)
# Description <!-- Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change. --> See dev registry [here](https://hub.docker.com/search?q=argilladev) **Type of change** <!-- Please delete options that are not relevant. Remember to title the PR according to the type of change --> - Improvement (change adding some improvement to an existing functionality) **How Has This Been Tested** <!-- Please add some reference about how your feature has been tested. --> **Checklist** <!-- Please go over the list and make sure you've taken everything into account --> - I added relevant documentation - I followed the style guidelines of this project - I did a self-review of my code - I made corresponding changes to the documentation - I confirm My changes generate no new warnings - I have added tests that prove my fix is effective or that my feature works - I have added relevant notes to the CHANGELOG.md file (See https://keepachangelog.com/)
1 parent a5eaa9b commit 93d3f87

File tree

2 files changed

+23
-9
lines changed

2 files changed

+23
-9
lines changed

.github/workflows/argilla-server.build-docker-images.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,26 @@ jobs:
4848
if [[ $IS_RELEASE == true ]]; then
4949
echo "PLATFORMS=linux/amd64,linux/arm64" >> $GITHUB_ENV
5050
echo "IMAGE_TAG=v$PACKAGE_VERSION" >> $GITHUB_ENV
51+
echo "SERVER_DOCKER_IMAGE=argilla/argilla-server" >> $GITHUB_ENV
52+
echo "QUICKSTART_DOCKER_IMAGE=argilla/argilla-quickstart" >> $GITHUB_ENV
53+
echo "DOCKER_USERNAME=$DOCKER_USERNAME" >> $GITHUB_ENV
54+
echo "DOCKER_PASSWORD=$DOCKER_PASSWORD" >> $GITHUB_ENV
5155
else
5256
echo "PLATFORMS=linux/amd64" >> $GITHUB_ENV
5357
echo "IMAGE_TAG=$DOCKER_IMAGE_TAG" >> $GITHUB_ENV
58+
echo "SERVER_DOCKER_IMAGE=argilladev/argilla-server" >> $GITHUB_ENV
59+
echo "QUICKSTART_DOCKER_IMAGE=argilladev/argilla-quickstart" >> $GITHUB_ENV
60+
echo "DOCKER_USERNAME=$DOCKER_USERNAME_DEV" >> $GITHUB_ENV
61+
echo "DOCKER_PASSWORD=$DOCKER_PASSWORD_DEV" >> $GITHUB_ENV
5462
fi
5563
env:
5664
IS_RELEASE: ${{ inputs.is_release }}
5765
PACKAGE_VERSION: ${{ steps.package-info.outputs.PACKAGE_VERSION }}
5866
DOCKER_IMAGE_TAG: ${{ steps.docker-image-tag-from-ref.outputs.docker-image-tag }}
67+
DOCKER_USERNAME: ${{ secrets.AR_DOCKER_USERNAME }}
68+
DOCKER_PASSWORD: ${{ secrets.AR_DOCKER_PASSWORD }}
69+
DOCKER_USERNAME_DEV: ${{ secrets.AR_DOCKER_USERNAME_DEV }}
70+
DOCKER_PASSWORD_DEV: ${{ secrets.AR_DOCKER_PASSWORD_DEV }}
5971

6072
- name: Set up QEMU
6173
if: ${{ inputs.is_release }}
@@ -67,8 +79,8 @@ jobs:
6779
- name: Login to Docker Hub
6880
uses: docker/login-action@v3
6981
with:
70-
username: ${{ secrets.AR_DOCKER_USERNAME }}
71-
password: ${{ secrets.AR_DOCKER_PASSWORD }}
82+
username: ${{ env.DOCKER_USERNAME }}
83+
password: ${{ env.DOCKER_PASSWORD }}
7284

7385
- name: Download python package
7486
uses: actions/download-artifact@v4
@@ -82,7 +94,7 @@ jobs:
8294
context: argilla-server/docker/server
8395
file: argilla-server/docker/server/Dockerfile
8496
platforms: ${{ env.PLATFORMS }}
85-
tags: argilla/argilla-server:${{ env.IMAGE_TAG }}
97+
tags: ${{ env.SERVER_DOCKER_IMAGE }}:${{ env.IMAGE_TAG }}
8698
labels: ${{ steps.meta.outputs.labels }}
8799
push: true
88100

@@ -93,7 +105,7 @@ jobs:
93105
context: argilla-server/docker/server
94106
file: argilla-server/docker/server/Dockerfile
95107
platforms: ${{ env.PLATFORMS }}
96-
tags: argilla/argilla-server:latest
108+
tags: ${{ env.SERVER_DOCKER_IMAGE }}:latest
97109
labels: ${{ steps.meta.outputs.labels }}
98110
push: true
99111

@@ -103,9 +115,10 @@ jobs:
103115
context: argilla-server/docker/quickstart
104116
file: argilla-server/docker/quickstart/Dockerfile
105117
platforms: ${{ env.PLATFORMS }}
106-
tags: argilla/argilla-quickstart:${{ env.IMAGE_TAG }}
118+
tags: ${{ env.QUICKSTART_DOCKER_IMAGE }}:${{ env.IMAGE_TAG }}
107119
labels: ${{ steps.meta.outputs.labels }}
108120
build-args: |
121+
ARGILLA_SERVER_IMAGE=${{ env.SERVER_DOCKER_IMAGE }}
109122
ARGILLA_VERSION=${{ env.IMAGE_TAG }}
110123
push: true
111124

@@ -116,7 +129,7 @@ jobs:
116129
context: argilla-server/docker/quickstart
117130
file: argilla-server/docker/quickstart/Dockerfile
118131
platforms: ${{ env.PLATFORMS }}
119-
tags: argilla/argilla-quickstart:latest
132+
tags: ${{ env.QUICKSTART_DOCKER_IMAGE }}:latest
120133
labels: ${{ steps.meta.outputs.labels }}
121134
build-args: |
122135
ARGILLA_VERSION=${{ env.IMAGE_TAG }}
@@ -126,8 +139,8 @@ jobs:
126139
uses: peter-evans/dockerhub-description@v4
127140
if: ${{ inputs.is_release && inputs.publish_latest }}
128141
with:
129-
username: ${{ secrets.AR_DOCKER_USERNAME }}
130-
password: ${{ secrets.AR_DOCKER_PASSWORD }}
142+
username: ${{ env.DOCKER_USERNAME }}
143+
password: ${{ env.DOCKER_PASSWORD }}
131144
repository: argilla/argilla-server
132145
readme-filepath: argilla-server/README.md
133146

argilla-server/docker/quickstart/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# TODO(gabrielmbmb): update this `Dockerfile` to multi-staged build to reduce the image size
22
ARG ARGILLA_VERSION=latest
3-
FROM argilla/argilla-server:${ARGILLA_VERSION}
3+
ARG ARGILLA_SERVER_IMAGE=argilla/argilla-server
4+
FROM ${ARGILLA_SERVER_IMAGE}:${ARGILLA_VERSION}
45

56
USER root
67

0 commit comments

Comments
 (0)