From cc7fa8333c528d1b0b8dcee03d4dcce6c1f8f6d1 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Tue, 26 Nov 2024 09:02:53 +0100 Subject: [PATCH 01/16] chore(icons): contribute to #2397 by improving the comment instructions --- src/Utils/Icon.hs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Utils/Icon.hs b/src/Utils/Icon.hs index 0d9b68b5f..5a2982bef 100644 --- a/src/Utils/Icon.hs +++ b/src/Utils/Icon.hs @@ -30,7 +30,11 @@ type WidgetSiteless = forall site. WidgetFor site () -- For consistency, some conditional icons are also provided, having suffix True/False --------------------------------------------------------------------------- --- IMPORTANT: Alert-Icons must be registered in alert-icons.js as well!!! +-- IMPORTANT: +-- All icons must be manually registered within the following files: +-- - src/Utils/Icon.hs +-- - assets/icon-src/fontawesome.json +-- - frontend/src/icons.scss --------------------------------------------------------------------------- data Icon = IconNew @@ -40,7 +44,7 @@ data Icon | IconProblem | IconVisible | IconInvisible - -- | IconCourse -- not used, IconMenuCourse is currently only used + -- | IconCourse -- not used, IconMenuCourse is currently only used | IconCourseFavouriteManual | IconCourseFavouriteAutomatic | IconCourseFavouriteOff | IconEnrolTrue | IconEnrolFalse @@ -118,13 +122,13 @@ data Icon | IconCompany | IconEdit | IconUserEdit - + deriving (Eq, Ord, Enum, Bounded, Show, Read, Generic) deriving anyclass (Universe, Finite, NFData) iconText :: Icon -> Text -iconText = camelToPathPiece' 1 . tshow +iconText = camelToPathPiece' 1 . tshow nullaryPathPiece ''Icon $ camelToPathPiece' 1 deriveLift ''Icon @@ -140,7 +144,7 @@ icon ic = [shamlet| |] - + -- Create an icon with fixed width iconFixed :: Icon -> Markup iconFixed ic = [shamlet| From fe9a92fd3f7e070785f7c5816efe6a8bdf2db148 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 26 Nov 2024 12:23:04 +0000 Subject: [PATCH 02/16] Update azure-pipelines.yaml for Azure Pipelines --- azure-pipelines.yaml | 57 +++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index 7da1e371e..12be6d762 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -16,18 +16,27 @@ jobs: # echo Add other tasks to build, test, and deploy your project. # echo See https://aka.ms/yaml # displayName: 'Run a multi-line script' -# - job: DockerTaskTest -# container: -# image: 'devfra.azurecr.io/de.fraport.trusted/ubuntu:22.04' -# endpoint: devfra -# steps: -# - task: Docker@2 -# displayName: Image build test -# inputs: -# command: buildAndPush -# Dockerfile: docker/backend/Dockerfile -# buildContext: . -# tags: backend +- job: DockerTaskTest + container: + image: devfra.azurecr.io/de.fraport.build/tools:1.1.0 + endpoint: devfra + steps: + - task: Docker@2 + name: dockerLoginDevFra + displayName: Docker Login to devfra + inputs: + command: login + containerRegistry: devFra + - task: Docker@2 + name: dockerBuild + displayName: Backend image build+push test + inputs: + command: buildAndPush + Dockerfile: docker/backend/Dockerfile + buildContext: . + tags: | + $(Build.BuildNumber) + backend # - job: BuildKitTest # container: # image: 'devfra.azurecr.io/de.fraport.trusted/buildkit:0.12.1' @@ -38,15 +47,15 @@ jobs: # --local context=. \ # --local dockerfile=docker/backend/Dockerfile # displayName: BuildKit test -- job: CustomBuildahTest - container: - image: 'devfra.azurecr.io/de.fraport.trusted/ubuntu:22.04' - endpoint: devfra - steps: - - script: | - id - docker build --help - sudo apt-get -y update - sudo apt-get -y install buildah - buildah bud -t fradrive-backend-test --volume .:/mnt/fradrive --file docker/backend/Dockerfile - displayName: Build buildah image \ No newline at end of file +# - job: CustomBuildahTest +# container: +# image: 'devfra.azurecr.io/de.fraport.trusted/ubuntu:22.04' +# endpoint: devfra +# steps: +# - script: | +# id +# docker build --help +# sudo apt-get -y update +# sudo apt-get -y install buildah +# buildah bud -t fradrive-backend-test --volume .:/mnt/fradrive --file docker/backend/Dockerfile +# displayName: Build buildah image \ No newline at end of file From 29427a02c6c08af9ce6dab0a0dcd9054ceb178f2 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 26 Nov 2024 12:58:00 +0000 Subject: [PATCH 03/16] chore(docker/backend): switch base image, print version info --- docker/backend/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 54a0c5d55..56ca791c7 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -1,4 +1,6 @@ -FROM debian:12.5 +FROM devfra.azurecr.io/de.fraport.build/tools:1.1.0 + +RUN lsb_release -a RUN apt-get update && apt-get -y install inotify-tools RUN apt-get -y update && apt-get -y install haskell-stack git From 33ccd36a1403724bfd03a5d33a7ccf879a41cafb Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 26 Nov 2024 13:05:34 +0000 Subject: [PATCH 04/16] ci(docker/backend): remove apt-get update due to missing connection to archive.ubuntu.com --- docker/backend/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 56ca791c7..84805d522 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -2,10 +2,10 @@ FROM devfra.azurecr.io/de.fraport.build/tools:1.1.0 RUN lsb_release -a -RUN apt-get update && apt-get -y install inotify-tools -RUN apt-get -y update && apt-get -y install haskell-stack git -RUN apt-get -y update && apt-get -y install alex g++ happy libghc-zlib-dev libpq-dev libsodium-dev locales locales-all pkg-config -RUN apt-get -y update && apt-get -y install llvm +RUN apt-get -y install inotify-tools +RUN apt-get -y install haskell-stack git +RUN apt-get -y install alex g++ happy libghc-zlib-dev libpq-dev libsodium-dev locales locales-all pkg-config +RUN apt-get -y install llvm ENV LANG=en_US.UTF-8 From a2bd5c35c8b8c8abefa8941ac91421a59ca12b3c Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 28 Nov 2024 10:57:24 +0100 Subject: [PATCH 05/16] build(docker/backend): reintroduce apt-get update --- docker/backend/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 84805d522..419a9cf5c 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -1,11 +1,12 @@ FROM devfra.azurecr.io/de.fraport.build/tools:1.1.0 +# debug info RUN lsb_release -a -RUN apt-get -y install inotify-tools -RUN apt-get -y install haskell-stack git -RUN apt-get -y install alex g++ happy libghc-zlib-dev libpq-dev libsodium-dev locales locales-all pkg-config -RUN apt-get -y install llvm +RUN apt-get -y update && apt-get -y install inotify-tools +RUN apt-get -y update && apt-get -y install haskell-stack git +RUN apt-get -y update && apt-get -y install alex g++ happy libghc-zlib-dev libpq-dev libsodium-dev locales locales-all pkg-config +RUN apt-get -y update && apt-get -y install llvm ENV LANG=en_US.UTF-8 From 9df3b18680c6fe78afc23977413574e58f09888d Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 28 Nov 2024 11:01:30 +0100 Subject: [PATCH 06/16] ci(azure-pipelines): set http/https proxy env variables --- azure-pipelines.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index 12be6d762..edf6a1db3 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -37,6 +37,10 @@ jobs: tags: | $(Build.BuildNumber) backend + env: + HTTPS_PROXY: 'http://FUBLD01:$(FUBLD01_PWD)@proxy.frankfurt-airport.de:8080' + HTTP_PROXY: 'http://FUBLD01:$(FUBLD01_PWD)@proxy.frankfurt-airport.de:8080' + NO_PROXY: 'localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' # - job: BuildKitTest # container: # image: 'devfra.azurecr.io/de.fraport.trusted/buildkit:0.12.1' From d1126b3acf4e75da518a6db5ed12182d3ff2ea2a Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 28 Nov 2024 11:40:20 +0100 Subject: [PATCH 07/16] build(docker/backend): add debug info prints for ci --- docker/backend/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 419a9cf5c..721c0287f 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -2,6 +2,9 @@ FROM devfra.azurecr.io/de.fraport.build/tools:1.1.0 # debug info RUN lsb_release -a +RUN curl -k https://google.de +RUN env +RUN curl -sSLk -x $HTTP_PROXY RUN apt-get -y update && apt-get -y install inotify-tools RUN apt-get -y update && apt-get -y install haskell-stack git From fc687778263129b8079d06589357f4850b0f37b9 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 28 Nov 2024 11:43:19 +0100 Subject: [PATCH 08/16] build(docker/backend): remove debug prints --- docker/backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 721c0287f..cf2425275 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -2,7 +2,7 @@ FROM devfra.azurecr.io/de.fraport.build/tools:1.1.0 # debug info RUN lsb_release -a -RUN curl -k https://google.de +# RUN curl -k https://google.de RUN env RUN curl -sSLk -x $HTTP_PROXY From 8967837155bfd06b416057da5f3a4aa3cf3a825c Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 28 Nov 2024 11:46:48 +0100 Subject: [PATCH 09/16] ci(azure-pipelines): try http(s) proxy without password --- azure-pipelines.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index edf6a1db3..3dff257b8 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -38,8 +38,8 @@ jobs: $(Build.BuildNumber) backend env: - HTTPS_PROXY: 'http://FUBLD01:$(FUBLD01_PWD)@proxy.frankfurt-airport.de:8080' - HTTP_PROXY: 'http://FUBLD01:$(FUBLD01_PWD)@proxy.frankfurt-airport.de:8080' + HTTPS_PROXY: 'http://proxy.frankfurt-airport.de:8080' + HTTP_PROXY: 'http://proxy.frankfurt-airport.de:8080' NO_PROXY: 'localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' # - job: BuildKitTest # container: From 609adaa960cb48d0e1f0264579dd95e124babce4 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 28 Nov 2024 11:48:45 +0100 Subject: [PATCH 10/16] build(docker/backend): remove debug info --- docker/backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index cf2425275..4b4279d99 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -4,7 +4,7 @@ FROM devfra.azurecr.io/de.fraport.build/tools:1.1.0 RUN lsb_release -a # RUN curl -k https://google.de RUN env -RUN curl -sSLk -x $HTTP_PROXY +# RUN curl -sSLk -x $HTTP_PROXY RUN apt-get -y update && apt-get -y install inotify-tools RUN apt-get -y update && apt-get -y install haskell-stack git From dec0f2667d4e2687190479c1df0827287451c22b Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 28 Nov 2024 11:56:03 +0100 Subject: [PATCH 11/16] ci(azure-pipelines): add build args via arguments --- azure-pipelines.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index 3dff257b8..d8b9ce1f1 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -31,16 +31,17 @@ jobs: name: dockerBuild displayName: Backend image build+push test inputs: - command: buildAndPush + command: build Dockerfile: docker/backend/Dockerfile buildContext: . tags: | $(Build.BuildNumber) backend - env: - HTTPS_PROXY: 'http://proxy.frankfurt-airport.de:8080' - HTTP_PROXY: 'http://proxy.frankfurt-airport.de:8080' - NO_PROXY: 'localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' + arguments: | + --build-arg \ + HTTPS_PROXY='http://proxy.frankfurt-airport.de:8080' \ + HTTP_PROXY='http://proxy.frankfurt-airport.de:8080' \ + NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' # - job: BuildKitTest # container: # image: 'devfra.azurecr.io/de.fraport.trusted/buildkit:0.12.1' From a20ade7c526de34c4ddf473f822a2d0a5f4e8cf6 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 28 Nov 2024 11:58:09 +0100 Subject: [PATCH 12/16] ci(azure-pipelines): fix newline escaping --- azure-pipelines.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index d8b9ce1f1..8f2c0cf3b 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -38,9 +38,9 @@ jobs: $(Build.BuildNumber) backend arguments: | - --build-arg \ - HTTPS_PROXY='http://proxy.frankfurt-airport.de:8080' \ - HTTP_PROXY='http://proxy.frankfurt-airport.de:8080' \ + --build-arg + HTTPS_PROXY='http://proxy.frankfurt-airport.de:8080' + HTTP_PROXY='http://proxy.frankfurt-airport.de:8080' NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' # - job: BuildKitTest # container: From 304c8c2ca9cbe5088bf4bbdb2d09351fb4bae3a3 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 28 Nov 2024 12:01:43 +0100 Subject: [PATCH 13/16] ci(azure-pipelines): add multiple build-args --- azure-pipelines.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index 8f2c0cf3b..864cd0310 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -29,7 +29,7 @@ jobs: containerRegistry: devFra - task: Docker@2 name: dockerBuild - displayName: Backend image build+push test + displayName: Backend image build test inputs: command: build Dockerfile: docker/backend/Dockerfile @@ -38,10 +38,9 @@ jobs: $(Build.BuildNumber) backend arguments: | - --build-arg - HTTPS_PROXY='http://proxy.frankfurt-airport.de:8080' - HTTP_PROXY='http://proxy.frankfurt-airport.de:8080' - NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' + --build-arg HTTPS_PROXY='http://proxy.frankfurt-airport.de:8080' + --build-arg HTTP_PROXY='http://proxy.frankfurt-airport.de:8080' + --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' # - job: BuildKitTest # container: # image: 'devfra.azurecr.io/de.fraport.trusted/buildkit:0.12.1' From 082dd74bb0cb210f5f2dbf0fa394b7f33f2d5904 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 28 Nov 2024 14:03:45 +0100 Subject: [PATCH 14/16] ci(azure-pipelines): proxy vars without parentheses --- azure-pipelines.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index 864cd0310..581e555da 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -38,8 +38,8 @@ jobs: $(Build.BuildNumber) backend arguments: | - --build-arg HTTPS_PROXY='http://proxy.frankfurt-airport.de:8080' - --build-arg HTTP_PROXY='http://proxy.frankfurt-airport.de:8080' + --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 + --build-arg HTTP_PROXY=http://proxy.frankfurt-airport.de:8080 --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' # - job: BuildKitTest # container: From 0e605386cc3997bb00ff45ac2313952700ed57b0 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 2 Dec 2024 16:32:41 +0100 Subject: [PATCH 15/16] build(Makefile): add SRC option to ghci target --- Makefile | 6 ++++-- docker/backend/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a105940f6..cfe1c5776 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,7 @@ export STACK_CORES = $(shell echo $(($(CPU_CORES)/2))) export BASE_PORTS export UNIWORXDB_OPTS ?= -cf export PROD ?= false +export SRC ifneq ($(PROD),true) export --DEVELOPMENT=--flag uniworx:dev @@ -245,6 +246,7 @@ endif --env CONTAINER_FILE=$(CONTAINER_FILE) \ --env CONTAINER_NAME=$${CONTAINER_NAME} \ --env JOB=$(JOB) \ + --env SRC=$(SRC) \ --name $${CONTAINER_NAME} \ $${CONTAINER_CMD} \ ` ; \ @@ -293,7 +295,7 @@ uniworx.cabal: --start-frontend: --compile-frontend; --dependencies-frontend: node_modules assets static well-known; node_modules: package.json package-lock.json - npm ci --cache .npm --prefer-offline + npm install --cache .npm --prefer-offline package-lock.json: package.json npm install --cache .npm --prefer-offline assets: assets/favicons assets/icons; @@ -315,7 +317,7 @@ well-known: static; ./bin/uniworxdb $(UNIWORXDB_OPTS) --shell-ghci: - stack exec -- ghci + stack exec -- ghci $(SRC) # --main-is uniworx:exe:uniworx # HELP(shell-{backend,frontend,memcached,minio,postgres}): enter (bash) shell inside a new container of a given service diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 4b4279d99..64872a038 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -32,7 +32,7 @@ RUN stack install yesod-bin RUN stack install hpack ENV FRADRIVE_MAKE_TARGET=--start-backend -ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} STACK_ROOT="${STACK_ROOT}" IN_CONTAINER=true CONTAINER_FILE="${CONTAINER_FILE}" JOB="${JOB}" +ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} STACK_ROOT="${STACK_ROOT}" IN_CONTAINER=true CONTAINER_FILE="${CONTAINER_FILE}" JOB="${JOB}" SRC="${SRC}" EXPOSE 3000/tcp EXPOSE 3443/tcp From c3117dbdcd1de9ef9f0751afa45018e2ebce2c42 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Mon, 2 Dec 2024 17:38:59 +0100 Subject: [PATCH 16/16] fix(ghci): ghci works now as expected --- Makefile | 8 +++++--- docker/backend/Dockerfile | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index cfe1c5776..cd008f20f 100644 --- a/Makefile +++ b/Makefile @@ -255,11 +255,13 @@ endif $(CONTAINER_COMMAND) attach $${CONTAINER_ID} || : ; \ fi +# For Reverse Proxy Problem see: https://groups.google.com/g/yesodweb/c/2EO53kSOuy0/m/Lw6tq2VYat4J + # HELP(start-backend): start development instance --start-backend: export DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \ export DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \ - export HOST=`hostname -s` ; \ + export HOST=127.0.0.1 ; \ export PORT=$${PORT:-$${DEV_PORT_HTTP}} ; \ export DETAILED_LOGGING=$${DETAILED_LOGGING:-true} ; \ export LOG_ALL=$${LOG_ALL:-false} ; \ @@ -273,7 +275,7 @@ endif export RIBBON=$${RIBBON:-$${HOST:-localhost}} ; \ export APPROOT=$${APPROOT:-http://localhost:$${DEV_PORT_HTTP}} ; \ export AVSPASS=$${AVSPASS:-nopasswordset} ; \ - stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin --copy-bins -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}" + stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin --copy-bins -- yesod devel -n -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}" # HELP(compile-backend): compile backend binaries --compile-backend: stack build $(STACK_CORES) --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only $(--DEVELOPMENT) --local-bin-path $$(pwd)/bin --copy-bins @@ -317,7 +319,7 @@ well-known: static; ./bin/uniworxdb $(UNIWORXDB_OPTS) --shell-ghci: - stack exec -- ghci $(SRC) + stack ghci -- $(SRC) # --main-is uniworx:exe:uniworx # HELP(shell-{backend,frontend,memcached,minio,postgres}): enter (bash) shell inside a new container of a given service diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 64872a038..e2629549c 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -1,7 +1,7 @@ -FROM devfra.azurecr.io/de.fraport.build/tools:1.1.0 +FROM docker.io/ubuntu:latest # debug info -RUN lsb_release -a +# RUN lsb_release -a # RUN curl -k https://google.de RUN env # RUN curl -sSLk -x $HTTP_PROXY