Skip to content

Commit d37ea00

Browse files
authored
build: replace mirrored images from docker hub (#467)
1 parent 60a8c27 commit d37ea00

File tree

7 files changed

+18
-10
lines changed

7 files changed

+18
-10
lines changed

.github/workflows/build_debian_docker.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
- name: Login to GitHub Container Registry
3434
uses: docker/login-action@v2
3535
with:
36-
registry: ${{ env.image_url_base }}
36+
registry: "ghcr.io/${{ github.repository_owner }}"
3737
username: ${{ github.actor }}
38-
password: ${{ secrets.GITHUB_TOKEN }}
38+
password: ${{ secrets.ROBOT_GITHUB_PACKAGES_WRITE_TOKEN }}
3939

4040
- name: Build and push
4141
uses: docker/build-push-action@v4

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
with:
137137
registry: "ghcr.io"
138138
username: ${{ github.actor }}
139-
password: ${{ secrets.GITHUB_TOKEN }}
139+
password: ${{ secrets.ROBOT_GITHUB_PACKAGES_WRITE_TOKEN }}
140140

141141
- name: Cleanup build folder
142142
run: |

.github/workflows/terrarium_check.yaml

+8-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ jobs:
1313
pytest:
1414
runs-on: [ self-hosted, linux ]
1515
container:
16-
image: "python:3.11.0"
16+
image: "ghcr.io/${{ github.repository_owner }}/docker-mirror/python:3.11.0"
17+
credentials:
18+
username: ${{ github.actor }}
19+
password: ${{ secrets.ROBOT_GITHUB_PACKAGES_READ_TOKEN }}
1720

1821
strategy:
1922
fail-fast: false
@@ -45,7 +48,10 @@ jobs:
4548
mypy:
4649
runs-on: [ self-hosted, linux ]
4750
container:
48-
image: "python:3.11.0"
51+
image: "ghcr.io/${{ github.repository_owner }}/docker-mirror/python:3.11.0"
52+
credentials:
53+
username: ${{ github.actor }}
54+
password: ${{ secrets.ROBOT_GITHUB_PACKAGES_READ_TOKEN }}
4955

5056
strategy:
5157
fail-fast: false

docker_build/_bake_vars_functions.hcl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# All variables should be prefixed with `DL_B_`
22

33
variable BASE_LINUX {
4-
default = "ubuntu:22.04"
4+
default = "ghcr.io/datalens-tech/docker-mirror/ubuntu:22.04"
55
}
66

77
variable DL_B_PROJECT_ROOT {
88
default = ".."
99
}
1010

1111
variable DL_B_FILE_OPS_IMG {
12-
default = "debian:bookworm-slim"
12+
default = "ghcr.io/datalens-tech/docker-mirror/debian:bookworm-slim"
1313
}
1414

1515
variable DL_B_EXT_CACHED_TARGET_BASE_CI {

docker_build/debian_docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm
1+
FROM ghcr.io/datalens-tech/docker-mirror/debian:bookworm
22

33
# run all scripts in ./scripts in alphabetical order
44
COPY ./scripts /tmp/scripts

docker_build/target_base_ci/scripts/700-venv.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ mkdir /venv
66
python -m venv /venv
77
source /venv/bin/activate
88

9-
pip install --no-input poetry==1.7.1
9+
# TODO FIX: pyproject-hooks fix version: https://github.com/python-poetry/poetry/issues/9351
10+
pip install --no-input poetry==1.7.1 pyproject-hooks==1.0.0
1011

1112
cd /src/metapkg
1213
poetry export --without=dev --without=ci --without-hashes --format=requirements.txt > requirements.txt

docker_build/target_base_jammy/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ RUN bash /install/install_py_310.sh
2727
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.10
2828
RUN python3 -m pip install -U pip
2929
# TODO FIX: try to install j2cli to dedicated venv & make symlink in /usr/local/bin
30-
RUN python3 -m pip install poetry==1.7.1 j2cli==0.3.10
30+
# TODO FIX: pyproject-hooks fix version: https://github.com/python-poetry/poetry/issues/9351
31+
RUN python3 -m pip install poetry==1.7.1 j2cli==0.3.10 pyproject-hooks==1.0.0
3132

3233
RUN curl "https://storage.yandexcloud.net/cloud-certs/CA.pem" > /usr/local/share/ca-certificates/yandex-cloud-ca.crt
3334
RUN update-ca-certificates

0 commit comments

Comments
 (0)