diff options
| author | inductor <kela@inductor.me> | 2023-02-02 16:06:34 +0900 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2023-02-13 20:06:25 +0100 |
| commit | 6a2ad2535bb5e37fc2f7fee180df51e283ca4e52 (patch) | |
| tree | 62088204c867c999b0507ab7ca70290612f92680 /docker | |
| parent | jsdialog: handle standard responses in messagebox (diff) | |
| download | online-6a2ad2535bb5e37fc2f7fee180df51e283ca4e52.tar.gz online-6a2ad2535bb5e37fc2f7fee180df51e283ca4e52.zip | |
Use COPY rather than ADD
Signed-off-by: inductor <kela@inductor.me>
Change-Id: I6f34fe0f41af627a8d6966ca42ead3b324251eba
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/from-packages/RHEL8 | 8 | ||||
| -rw-r--r-- | docker/from-packages/Ubuntu | 8 | ||||
| -rw-r--r-- | docker/from-packages/Ubuntu-ppc64le | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/docker/from-packages/RHEL8 b/docker/from-packages/RHEL8 index 5fcf954796..24c3554b57 100644 --- a/docker/from-packages/RHEL8 +++ b/docker/from-packages/RHEL8 @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.2 +# syntax=docker/dockerfile:1.4 # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this @@ -28,13 +28,13 @@ ARG nobrand ENV LC_CTYPE C.UTF-8 # Setup scripts for Collabora Online -ADD /scripts/install-collabora-online-rhel8.sh / +COPY /scripts/install-collabora-online-rhel8.sh / RUN --mount=type=secret,id=secret_key bash install-collabora-online-rhel8.sh RUN rm -rf /install-collabora-online-rhel8.sh # Start script for Collabora Online -ADD /scripts/start-collabora-online.sh / -ADD /scripts/start-collabora-online.pl / +COPY /scripts/start-collabora-online.sh / +COPY /scripts/start-collabora-online.pl / EXPOSE 9980 diff --git a/docker/from-packages/Ubuntu b/docker/from-packages/Ubuntu index 9963aa4dee..4983778ea7 100644 --- a/docker/from-packages/Ubuntu +++ b/docker/from-packages/Ubuntu @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.2 +# syntax=docker/dockerfile:1.4 # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this @@ -28,13 +28,13 @@ ARG nobrand ENV LC_CTYPE C.UTF-8 # Setup scripts for Collabora Online -ADD /scripts/install-collabora-online-ubuntu.sh / +COPY /scripts/install-collabora-online-ubuntu.sh / RUN --mount=type=secret,id=secret_key bash install-collabora-online-ubuntu.sh RUN rm -rf /install-collabora-online-ubuntu.sh # Start script for Collabora Online -ADD /scripts/start-collabora-online.sh / -ADD /scripts/start-collabora-online.pl / +COPY /scripts/start-collabora-online.sh / +COPY /scripts/start-collabora-online.pl / EXPOSE 9980 diff --git a/docker/from-packages/Ubuntu-ppc64le b/docker/from-packages/Ubuntu-ppc64le index 47596ba44a..44e3693d1e 100644 --- a/docker/from-packages/Ubuntu-ppc64le +++ b/docker/from-packages/Ubuntu-ppc64le @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.2 +# syntax=docker/dockerfile:1.4 # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this @@ -25,13 +25,13 @@ ARG type ENV LC_CTYPE C.UTF-8 # Setup scripts for Collabora Online -ADD /scripts/install-collabora-online-ubuntu.sh / +COPY /scripts/install-collabora-online-ubuntu.sh / RUN --mount=type=secret,id=secret_key bash install-collabora-online-ubuntu.sh RUN rm -rf /install-collabora-online-ubuntu.sh # Start script for Collabora Online -ADD /scripts/start-collabora-online.sh / -ADD /scripts/start-collabora-online.pl / +COPY /scripts/start-collabora-online.sh / +COPY /scripts/start-collabora-online.pl / EXPOSE 9980 |