diff options
| author | Sarah German <sgerman@gitlab.com> | 2023-10-31 07:34:15 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2023-10-31 07:34:15 +0300 |
| commit | 32d9e778b5abc0e963d489ae179f7421cef9324a (patch) | |
| tree | f2a3af1d0d9736120175e9b0be488dc502284b4b /dockerfiles | |
| parent | 08fa6df807755604fcf3bc0472bdbb533d2e3759 (diff) | |
Fix setup steps for Workspace container
Diffstat (limited to 'dockerfiles')
| -rw-r--r-- | dockerfiles/gitlab-docs-workspace.Dockerfile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/dockerfiles/gitlab-docs-workspace.Dockerfile b/dockerfiles/gitlab-docs-workspace.Dockerfile index c05d3f38..8f17a016 100644 --- a/dockerfiles/gitlab-docs-workspace.Dockerfile +++ b/dockerfiles/gitlab-docs-workspace.Dockerfile @@ -24,14 +24,14 @@ RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apt-get update & RUN curl -L -o /bin/hadolint https://github.com/hadolint/hadolint/releases/download/v2.12.0/hadolint-Linux-x86_64 \ && chmod +x /bin/hadolint -# Install asdf -# See https://asdf-vm.com/guide/getting-started.html#official-download -RUN git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v${ASDF_VERSION} && \ - echo ". $HOME/.asdf/asdf.sh" >> /root/.bashrc - # Build the docs from this branch COPY . /source/ WORKDIR /source -# Install asdf-managed dependencies -RUN ASDF_DIR="${ASDF_DIR:-${HOME}/.asdf}" && . ~/.asdf/asdf.sh && make setup +# Install asdf and dependencies +# See https://asdf-vm.com/guide/getting-started.html#official-download +RUN git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v${ASDF_VERSION} && \ + echo ". $HOME/.asdf/asdf.sh" >> /root/.bashrc && \ + ASDF_DIR="${HOME}/.asdf" && . "${HOME}"/.asdf/asdf.sh && \ + make setup && \ + bundle exec rake clone_repositories |