diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-08-07 12:51:11 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-08-07 12:51:11 +0000 |
| commit | 71e548e24191f9afe53f5679906d464b24c5c985 (patch) | |
| tree | f738829459a032079cf3afab3cc6cde895812c7c /Dockerfile | |
| parent | dae67cdc5db97d87b90b76b3283b674edc052e16 (diff) | |
| parent | a89906bb5f31fd2cbc7762aaaa8f4d9955568c48 (diff) | |
Merge branch '217904-deb-docker' into 'master'v3.20.1
Package license management deb from deb job
See merge request gitlab-org/security-products/license-management!203
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -1,12 +1,4 @@ # syntax = docker/dockerfile:experimental -FROM debian:stable AS gem-builder -WORKDIR /build -COPY . ./ -RUN ./bin/omnibus setup && \ - ./bin/omnibus build license_management && \ - mkdir -p /opt/toolcache && \ - cp pkg/*.deb /opt/toolcache/ - FROM debian:stable AS mono-builder RUN apt-get update -q RUN apt-get install --no-install-recommends -y apt-transport-https dirmngr gnupg ca-certificates @@ -24,8 +16,8 @@ ENV TERM="xterm" WORKDIR /opt/gitlab COPY config/01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc RUN mkdir -p /opt/toolcache -COPY --from=gem-builder /opt/toolcache/*.deb /opt/toolcache/ COPY --from=mono-builder /opt/toolcache/*.deb /opt/toolcache/mono/ +COPY pkg/license*.deb /opt/toolcache/ COPY config/install.sh /opt/install.sh RUN bash /opt/install.sh COPY run.sh / |
