diff --git a/doc/howto/registry.md b/doc/howto/registry.md index 0af23ddda8f8e0d3fc5cc57a2867c4ef2d55261c..e3e6c23d4fcafefb7b77833dc42a093c49ed744f 100644 --- a/doc/howto/registry.md +++ b/doc/howto/registry.md @@ -666,13 +666,13 @@ $ gdk start registry && gdk tail registry ok: run: /Users/mkozonogitlab/Developer/gdk/services/registry: (pid 20314) 0s, normally down 2022-10-28_21:41:21.24738 registry : runit control/t: sending TERM to -18831 2022-10-28_21:41:21.24741 registry : runit control/t: sending TERM to 18831 -2022-10-28_21:46:38.72345 registry : docker run -p 172.16.123.1:5000:5000 -u 0:0 -v /Users/mkozonogitlab/Developer/gdk/registry/config.yml:/etc/docker/registry/config.yml:ro -v /Users/mkozonogitlab/Developer/gdk/registry/storage:/var/lib/registry -v /Users/mkozonogitlab/Developer/gdk/localhost.crt:/etc/docker/registry/localhost.crt:ro -v /Users/mkozonogitlab/Developer/gdk/registry_host.crt:/etc/docker/registry/registry_host.crt:ro -v /Users/mkozonogitlab/Developer/gdk/registry_host.key:/etc/docker/registry/registry_host.key:ro registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.77.0-gitlab +2022-10-28_21:46:38.72345 registry : docker run -p 172.16.123.1:5000:5000 -u 0:0 -v /Users/mkozonogitlab/Developer/gdk/registry/config.yml:/etc/docker/registry/config.yml:ro -v /Users/mkozonogitlab/Developer/gdk/registry/storage:/var/lib/registry -v /Users/mkozonogitlab/Developer/gdk/localhost.crt:/etc/docker/registry/localhost.crt:ro -v /Users/mkozonogitlab/Developer/gdk/registry_host.crt:/etc/docker/registry/registry_host.crt:ro -v /Users/mkozonogitlab/Developer/gdk/registry_host.key:/etc/docker/registry/registry_host.key:ro registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.85.0-gitlab ^C $ gdk stop registry ok: down: /Users/mkozonogitlab/Developer/gdk/services/registry: 0s $ docker ps -a CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES -e73941e70bec registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.77.0-gitlab /scripts/process-... 24 seconds ago Exited (1) 24 seconds ago (starting) 172.16.123.1:5000->5000/tcp focused_aryabhata +e73941e70bec registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.85.0-gitlab /scripts/process-... 24 seconds ago Exited (1) 24 seconds ago (starting) 172.16.123.1:5000->5000/tcp focused_aryabhata $ docker logs focused_aryabhata configuration error: open /etc/docker/registry/config.yml: permission denied Usage: diff --git a/gdk.example.yml b/gdk.example.yml index 0acd8c0b1a1996cc1a58dfb84c647dc0aec66c49..9baeb86c067b4b4085573a0b32fd0963119f03d1 100644 --- a/gdk.example.yml +++ b/gdk.example.yml @@ -368,7 +368,7 @@ registry: enabled: false gid: '' host: 127.0.0.1 - image: registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.77.0-gitlab + image: registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.85.0-gitlab listen_address: 127.0.0.1 port: 5000 self_signed: false diff --git a/lib/gdk/config.rb b/lib/gdk/config.rb index 98dde210360ee04f527d1dfe68dc2372723b22f5..ac1764f3bcbb1d29e6748c4784bdb60e99cfa7c8 100644 --- a/lib/gdk/config.rb +++ b/lib/gdk/config.rb @@ -326,7 +326,7 @@ class Config < ConfigSettings string :image do read!('registry_image') || 'registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:' \ - 'v3.77.0-gitlab' + 'v3.85.0-gitlab' end bool(:self_signed) { false } diff --git a/spec/lib/gdk/config_spec.rb b/spec/lib/gdk/config_spec.rb index 527f1df6761e1f2a410c84f561e11e33bdfbfb4e..a03b8a13526c114292ab23488285a8b17ded89ef 100644 --- a/spec/lib/gdk/config_spec.rb +++ b/spec/lib/gdk/config_spec.rb @@ -2058,7 +2058,7 @@ describe '#image' do context 'when no image is specified' do it 'returns the default image' do - expect(config.registry.image).to eq('registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.77.0-gitlab') + expect(config.registry.image).to eq('registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.85.0-gitlab') end end end diff --git a/support/docker-registry b/support/docker-registry index 31485724779100e33d42b73a17d664850f6411fc..72f02aa2515f5071b63e1df2bfeb2108124f4ed9 100755 --- a/support/docker-registry +++ b/support/docker-registry @@ -27,7 +27,7 @@ if [[ "${registry_enabled}" == "true" ]]; then -v "${gdk_root}/localhost.crt:/etc/docker/registry/localhost.crt:ro" \ -v "${gdk_root}/registry_host.crt:/etc/docker/registry/registry_host.crt:ro" \ -v "${gdk_root}/registry_host.key:/etc/docker/registry/registry_host.key:ro" \ - "${registry_image:-registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.77.0-gitlab}" + "${registry_image:-registry.gitlab.com/gitlab-org/build/cng/gitlab-container-registry:v3.85.0-gitlab}" else echo "Docker registry disabled." # Keep active so the process supervisor (i.e. runit) thinks everything is okay