From 7f809d02081bba2083a98dab82e5d1deed253d23 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 25 Jul 2024 22:37:01 +0200 Subject: [PATCH] chore(Dockerfile): move fradrive-env Dockerfile to project root; remove old dockerignore --- .dockerignore | 1 - .dockerignore.license | 3 --- docker/fradrive-env/Dockerfile => Dockerfile | 6 +++++- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 .dockerignore delete mode 100644 .dockerignore.license rename docker/fradrive-env/Dockerfile => Dockerfile (87%) diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 01b7e33fd..000000000 --- a/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -**/* \ No newline at end of file diff --git a/.dockerignore.license b/.dockerignore.license deleted file mode 100644 index 0544bf968..000000000 --- a/.dockerignore.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2022 Gregor Kleen - -SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/docker/fradrive-env/Dockerfile b/Dockerfile similarity index 87% rename from docker/fradrive-env/Dockerfile rename to Dockerfile index 6f239e246..dc7dd465a 100644 --- a/docker/fradrive-env/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN npm install -g n RUN n 14.19.1 # backend -RUN stack install happy +# RUN stack install happy # TODO: "Specified bucket does not exist" error on debian # run git restore-mtime # frontend-test @@ -41,3 +41,7 @@ RUN apt-get -y install llvm RUN useradd -ms /bin/bash fradrive-env USER fradrive-env + +ADD . /fradrive-src + +ARG FONTAWESOME_NPM_AUTH_TOKEN \ No newline at end of file