Commit 2bd32095 authored by Michał "rysiek" Woźniak's avatar Michał "rysiek" Woźniak
Browse files

Merge branch 'test-updates' into 'master'

gem2.6

See merge request !1
parents 30d7fa8b b35f9a4e
......@@ -47,7 +47,7 @@ ARG ADD_REPOSITORY_KEYS=
RUN if [ "$ADD_REPOSITORY_KEYS" != "" ]; then \
echo "$ADD_REPOSITORY_KEYS" | sed -e 's/^[[:space:]]*//' | apt-key add - ; \
fi
# adding repositories from build args
ARG ADD_REPOSITORIES=
RUN if [ "$ADD_REPOSITORIES" != "" ]; then \
......@@ -78,10 +78,10 @@ RUN npm config -g set ca ""
RUN add-apt-repository ppa:brightbox/ruby-ng && \
apt-get update && \
apt-get install -y --no-install-recommends \
ruby2.4 \
ruby2.4-dev && \
ruby2.6 \
ruby2.6-dev && \
rm -rf /var/lib/apt/lists/*
# we might need to install some packages, but doing this in the entrypoint doesn't make any sense
ARG INSTALL_PACKAGES=
RUN if [ "$INSTALL_PACKAGES" != "" ]; then \
......@@ -90,9 +90,9 @@ RUN if [ "$INSTALL_PACKAGES" != "" ]; then \
--no-install-recommends && \
rm -rf /var/lib/apt/lists/* ; \
fi
# 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
# copy in the entrypoint script
......
......@@ -10,6 +10,12 @@
# gitlab-runner data directory
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}
# custom certificate authority path
CA_CERTIFICATES_PATH=${CA_CERTIFICATES_PATH:-$DATA_DIR/certs/ca.crt}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment