Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
rtorrent-docker
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Janne Mareike Koschinski
rtorrent-docker
Commits
6e50d5e3
Verified
Commit
6e50d5e3
authored
2 years ago
by
Janne Mareike Koschinski
Browse files
Options
Downloads
Patches
Plain Diff
feat: merge init and wireguard containers
parent
61d7a353
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#2881
passed
2 years ago
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+0
-9
0 additions, 9 deletions
.gitlab-ci.yml
init/Dockerfile
+0
-3
0 additions, 3 deletions
init/Dockerfile
init/entrypoint.sh
+0
-6
0 additions, 6 deletions
init/entrypoint.sh
wireguard/entrypoint.sh
+4
-0
4 additions, 0 deletions
wireguard/entrypoint.sh
with
4 additions
and
18 deletions
.gitlab-ci.yml
+
0
−
9
View file @
6e50d5e3
...
...
@@ -16,12 +16,3 @@ wireguard:
-
mkdir -p /kaniko/.docker
-
echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-
/kaniko/executor --context $CI_PROJECT_DIR/wireguard --dockerfile $CI_PROJECT_DIR/wireguard/Dockerfile --destination $CI_REGISTRY_IMAGE:wireguard-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA} --destination $CI_REGISTRY_IMAGE:wireguard
init
:
stage
:
build
image
:
name
:
gcr.io/kaniko-project/executor:debug
entrypoint
:
[
"
"
]
script
:
-
mkdir -p /kaniko/.docker
-
echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-
/kaniko/executor --context $CI_PROJECT_DIR/init --dockerfile $CI_PROJECT_DIR/init/Dockerfile --destination $CI_REGISTRY_IMAGE:init-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA} --destination $CI_REGISTRY_IMAGE:init
This diff is collapsed.
Click to expand it.
init/Dockerfile
deleted
100644 → 0
+
0
−
3
View file @
61d7a353
FROM
alpine:3.15
COPY
entrypoint.sh /entrypoint.sh
ENTRYPOINT
["/entrypoint.sh"]
This diff is collapsed.
Click to expand it.
init/entrypoint.sh
deleted
100755 → 0
+
0
−
6
View file @
61d7a353
#!/bin/sh
set
-eu
mkdir
-p
/dev/net
mknod
/dev/net/tun c 10 200
chmod
0666 /dev/net/tun
This diff is collapsed.
Click to expand it.
wireguard/entrypoint.sh
+
4
−
0
View file @
6e50d5e3
...
...
@@ -8,6 +8,10 @@ if [ -n "$LOCAL_NETWORK" ]; then
echo
interface
=
"
$interface
"
fi
mkdir
-p
/dev/net
mknod
/dev/net/tun c 10 200
chmod
0666 /dev/net/tun
wg-quick up /wireguard.conf
if
[
-n
"
$LOCAL_NETWORK
"
]
;
then
...
...
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