From 35d7f0ee59952c7450b57172dccc2fe047c3b236 Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Wed, 13 Sep 2023 12:30:24 +0530 Subject: [PATCH] remove update --- Accounts/Dockerfile.tpl | 2 +- AdminDashboard/Dockerfile.tpl | 2 +- ApiReference/Dockerfile.tpl | 2 +- Dashboard/Dockerfile.tpl | 2 +- DashboardAPI/Dockerfile.tpl | 2 +- File/Dockerfile.tpl | 2 +- HelmChart/Dockerfile.tpl | 2 +- Home/Dockerfile.tpl | 2 +- Identity/Dockerfile.tpl | 2 +- Integration/Dockerfile.tpl | 2 +- Licensing/Dockerfile.tpl | 2 +- LinkShortener/Dockerfile.tpl | 2 +- Nginx/Dockerfile.tpl | 2 +- Notification/Dockerfile.tpl | 2 +- Probe/Dockerfile.tpl | 2 +- ProbeAPI/Dockerfile.tpl | 2 +- Realtime/Dockerfile.tpl | 2 +- StatusPage/Dockerfile.tpl | 2 +- TestServer/Dockerfile.tpl | 2 +- Workers/Dockerfile.tpl | 2 +- Workflow/Dockerfile.tpl | 2 +- docker-compose.base.yml | 2 +- docker-compose.dev.yml | 4 ++-- docker-compose.yml | 4 ++-- 24 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Accounts/Dockerfile.tpl b/Accounts/Dockerfile.tpl index bb2ecb4d22..a0ecb69423 100755 --- a/Accounts/Dockerfile.tpl +++ b/Accounts/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] diff --git a/AdminDashboard/Dockerfile.tpl b/AdminDashboard/Dockerfile.tpl index f113f00de0..b42a3c1498 100755 --- a/AdminDashboard/Dockerfile.tpl +++ b/AdminDashboard/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] diff --git a/ApiReference/Dockerfile.tpl b/ApiReference/Dockerfile.tpl index 72dd472b67..8897683566 100755 --- a/ApiReference/Dockerfile.tpl +++ b/ApiReference/Dockerfile.tpl @@ -11,7 +11,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] diff --git a/Dashboard/Dockerfile.tpl b/Dashboard/Dockerfile.tpl index a5d4a8b12f..8fcf45a5e1 100755 --- a/Dashboard/Dockerfile.tpl +++ b/Dashboard/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] diff --git a/DashboardAPI/Dockerfile.tpl b/DashboardAPI/Dockerfile.tpl index b6e563ba10..6ab0b6404c 100755 --- a/DashboardAPI/Dockerfile.tpl +++ b/DashboardAPI/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl # Install python diff --git a/File/Dockerfile.tpl b/File/Dockerfile.tpl index 42a1eff12c..b103367639 100644 --- a/File/Dockerfile.tpl +++ b/File/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl # Install python diff --git a/HelmChart/Dockerfile.tpl b/HelmChart/Dockerfile.tpl index 0e3c0d9333..ce3bd664cc 100755 --- a/HelmChart/Dockerfile.tpl +++ b/HelmChart/Dockerfile.tpl @@ -11,7 +11,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] diff --git a/Home/Dockerfile.tpl b/Home/Dockerfile.tpl index 9ca127041b..bca8f5fc5b 100755 --- a/Home/Dockerfile.tpl +++ b/Home/Dockerfile.tpl @@ -20,7 +20,7 @@ ENV PRODUCTION=true ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] diff --git a/Identity/Dockerfile.tpl b/Identity/Dockerfile.tpl index ccadde83ca..55cc7a0ab1 100644 --- a/Identity/Dockerfile.tpl +++ b/Identity/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl # Install python diff --git a/Integration/Dockerfile.tpl b/Integration/Dockerfile.tpl index 7d4f2644e4..ffd76e140b 100644 --- a/Integration/Dockerfile.tpl +++ b/Integration/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl # Install python diff --git a/Licensing/Dockerfile.tpl b/Licensing/Dockerfile.tpl index bd81e0ce3c..df64f90852 100644 --- a/Licensing/Dockerfile.tpl +++ b/Licensing/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] diff --git a/LinkShortener/Dockerfile.tpl b/LinkShortener/Dockerfile.tpl index 629bd7dc95..8c7ab115ad 100644 --- a/LinkShortener/Dockerfile.tpl +++ b/LinkShortener/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl # Install python diff --git a/Nginx/Dockerfile.tpl b/Nginx/Dockerfile.tpl index 3c1060b5c1..963973545d 100644 --- a/Nginx/Dockerfile.tpl +++ b/Nginx/Dockerfile.tpl @@ -9,6 +9,6 @@ ENV GIT_SHA=${GIT_SHA} ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl COPY ./Nginx/default.conf.template /etc/nginx/templates/default.conf.template \ No newline at end of file diff --git a/Notification/Dockerfile.tpl b/Notification/Dockerfile.tpl index f2fae29434..b3c93fff76 100755 --- a/Notification/Dockerfile.tpl +++ b/Notification/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] diff --git a/Probe/Dockerfile.tpl b/Probe/Dockerfile.tpl index 42154bf05c..b55a3f3632 100644 --- a/Probe/Dockerfile.tpl +++ b/Probe/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl diff --git a/ProbeAPI/Dockerfile.tpl b/ProbeAPI/Dockerfile.tpl index 8cf48defee..e454882c4d 100755 --- a/ProbeAPI/Dockerfile.tpl +++ b/ProbeAPI/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl # Install python diff --git a/Realtime/Dockerfile.tpl b/Realtime/Dockerfile.tpl index 04d8f2f9f0..a3c99e1bfa 100755 --- a/Realtime/Dockerfile.tpl +++ b/Realtime/Dockerfile.tpl @@ -18,7 +18,7 @@ ENV APP_VERSION=${APP_VERSION} ENV PRODUCTION=true # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] diff --git a/StatusPage/Dockerfile.tpl b/StatusPage/Dockerfile.tpl index 952ad8037b..95520436c0 100755 --- a/StatusPage/Dockerfile.tpl +++ b/StatusPage/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl #Use bash shell by default SHELL ["/bin/bash", "-c"] diff --git a/TestServer/Dockerfile.tpl b/TestServer/Dockerfile.tpl index d464348bb3..3dde5f2342 100755 --- a/TestServer/Dockerfile.tpl +++ b/TestServer/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl # Install python diff --git a/Workers/Dockerfile.tpl b/Workers/Dockerfile.tpl index 24c7793108..084b3ee1d9 100755 --- a/Workers/Dockerfile.tpl +++ b/Workers/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl # Install open ssl. RUN apk add openssl diff --git a/Workflow/Dockerfile.tpl b/Workflow/Dockerfile.tpl index cf6c9c95c8..7b051bc81d 100644 --- a/Workflow/Dockerfile.tpl +++ b/Workflow/Dockerfile.tpl @@ -15,7 +15,7 @@ ENV APP_VERSION=${APP_VERSION} # Install bash. -RUN apk update && apk add bash && apk add curl +RUN apk add bash && apk add curl # Install python diff --git a/docker-compose.base.yml b/docker-compose.base.yml index b1cde7aa29..9ce24f59c9 100644 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -396,7 +396,7 @@ services: PORT: ${API_DOCS_PORT} - nginx: + ingress: depends_on: - identity - accounts diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 89bae69dcc..152a8f5b2c 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -450,14 +450,14 @@ services: dockerfile: ./ApiReference/Dockerfile - nginx: + ingress: build: network: host context: . dockerfile: ./Nginx/Dockerfile extends: file: ./docker-compose.base.yml - service: nginx + service: ingress volumes: postgres: diff --git a/docker-compose.yml b/docker-compose.yml index 94ca873297..1dea9fc957 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -144,11 +144,11 @@ services: service: api-reference - nginx: + ingress: image: oneuptime/nginx:${APP_TAG} extends: file: ./docker-compose.base.yml - service: nginx + service: ingress volumes: postgres: