Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
libre
gitlab-jekyll-runner
Commits
2bd32095
Commit
2bd32095
authored
May 05, 2020
by
Michał "rysiek" Woźniak
Browse files
Merge branch 'test-updates' into 'master'
gem2.6 See merge request
!1
parents
30d7fa8b
b35f9a4e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
Dockerfile
Dockerfile
+6
-6
entrypoint
entrypoint
+6
-0
No files found.
Dockerfile
View file @
2bd32095
...
@@ -78,8 +78,8 @@ RUN npm config -g set ca ""
...
@@ -78,8 +78,8 @@ RUN npm config -g set ca ""
RUN
add-apt-repository ppa:brightbox/ruby-ng
&&
\
RUN
add-apt-repository ppa:brightbox/ruby-ng
&&
\
apt-get update
&&
\
apt-get update
&&
\
apt-get
install
-y
--no-install-recommends
\
apt-get
install
-y
--no-install-recommends
\
ruby2.
4
\
ruby2.
6
\
ruby2.
4
-dev
&&
\
ruby2.
6
-dev
&&
\
rm
-rf
/var/lib/apt/lists/
*
rm
-rf
/var/lib/apt/lists/
*
# we might need to install some packages, but doing this in the entrypoint doesn't make any sense
# we might need to install some packages, but doing this in the entrypoint doesn't make any sense
...
@@ -92,7 +92,7 @@ RUN if [ "$INSTALL_PACKAGES" != "" ]; then \
...
@@ -92,7 +92,7 @@ RUN if [ "$INSTALL_PACKAGES" != "" ]; then \
fi
fi
# Jekyll-related requirements
# Jekyll-related requirements
RUN
gem2.
4
install
jekyll:
'<4'
bundler:
'<2'
RUN
gem2.
6
install
jekyll:
'<4'
bundler:
'<2'
RUN
/usr/bin/npm
install
bower
-g
RUN
/usr/bin/npm
install
bower
-g
# copy in the entrypoint script
# copy in the entrypoint script
...
...
entrypoint
View file @
2bd32095
...
@@ -10,6 +10,12 @@
...
@@ -10,6 +10,12 @@
# gitlab-runner data directory
# gitlab-runner data directory
DATA_DIR
=
"/etc/gitlab-runner"
DATA_DIR
=
"/etc/gitlab-runner"
# fix permissions on the home directory
echo
echo
"+-- changing /home/gitlab-runner owner to:
$(
getent passwd gitlab-runner |
cut
-d
':'
-f
3,4
)
"
chown
-R
"
$(
getent passwd gitlab-runner |
cut
-d
':'
-f
3,4
)
"
/home/gitlab-runner
CONFIG_FILE
=
${
CONFIG_FILE
:-
$DATA_DIR
/config.toml
}
CONFIG_FILE
=
${
CONFIG_FILE
:-
$DATA_DIR
/config.toml
}
# custom certificate authority path
# custom certificate authority path
CA_CERTIFICATES_PATH
=
${
CA_CERTIFICATES_PATH
:-
$DATA_DIR
/certs/ca.crt
}
CA_CERTIFICATES_PATH
=
${
CA_CERTIFICATES_PATH
:-
$DATA_DIR
/certs/ca.crt
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment