Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hub
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Package registry
Operate
Terraform modules
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
thomasDOTwtf
hub
Commits
59c71669
Commit
59c71669
authored
9 months ago
by
HeJ
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix/docker-registry' into 'develop'
Add REGISTRY ARG to the Dockerfile See merge request
!1002
parents
168d8000
15f630ef
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-0
1 addition, 0 deletions
.gitlab-ci.yml
Dockerfile
+3
-2
3 additions, 2 deletions
Dockerfile
with
4 additions
and
2 deletions
.gitlab-ci.yml
+
1
−
0
View file @
59c71669
...
@@ -79,6 +79,7 @@ default:
...
@@ -79,6 +79,7 @@ default:
KANIKO_ARGS
:
KANIKO_ARGS
:
--skip-unused-stages=true
--skip-unused-stages=true
--context $CI_PROJECT_DIR
--context $CI_PROJECT_DIR
--build-arg REGISTRY=git.cccv.de/crews/hub/dependency_proxy/containers/
before_script
:
before_script
:
-
|
-
|
cat > /kaniko/.docker/config.json <<EOF
cat > /kaniko/.docker/config.json <<EOF
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
3
−
2
View file @
59c71669
FROM
git.cccv.de/crews/hub/dependency_proxy/containers/python:3.13-bookworm
as
base
ARG
REGISTRY=""
FROM
${REGISTRY}python:3.13-bookworm
as
base
ARG
DEVELOPMENT=False
ARG
DEVELOPMENT=False
...
@@ -80,7 +81,7 @@ RUN export DJANGO_SETTINGS_MODULE='hub.settings.build' && \
...
@@ -80,7 +81,7 @@ RUN export DJANGO_SETTINGS_MODULE='hub.settings.build' && \
######################################### [nginx] #############################
######################################### [nginx] #############################
FROM
git.cccv.de/crews/hub/dependency_proxy/containers/
nginx:1.25-alpine-slim
as
nginx-forwarder
FROM
${REGISTRY}
nginx:1.25-alpine-slim
as
nginx-forwarder
ENV
APP_SOCKET="/run/hub/app.sock"
ENV
APP_SOCKET="/run/hub/app.sock"
ENV
SCRIPT_NAME=""
ENV
SCRIPT_NAME=""
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment