remove stale comment, update all celo deps together

celo-org · Oct 31, 2023 · 875af3c · 875af3c
1 parent 32fba91
commit 875af3c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -16,6 +16,8 @@ updates:
       day: "monday"
       interval: "weekly"
     groups:
+      celo-dependencies:
+        patterns: ["^@celo/"]
       development-dependencies:
         dependency-type: "development"
         update-types:

diff --git a/dockerfiles/Dockerfile-combiner b/dockerfiles/Dockerfile-combiner
@@ -25,11 +25,8 @@ COPY .yarn/releases/ .yarn/releases/
 # Makes build fail if it doesn't copy git, will be removed after build
 COPY .git .git
 
-# Setting ONLY_PUBLISHED_DEPENDENCIES to true or any non-empty string results in only the
-# phone-number-privacy package being copied into the image, and therefore it will only build using
-# published dependencies. Setting ONLY_PUBLISHED_DEPENDENCIES to "" will copy in all dependecies.
-ARG ONLY_PUBLISHED_DEPENDENCIES=""
-ARG PACKAGE_SELECTOR=${ONLY_PUBLISHED_DEPENDENCIES:+combiner}
+ARG PACKAGE_SELECTOR=combiner
+# COMMENT OUT THIS LINE TO USE PUBLISHED DEPENDENCIES
 COPY --from=packages celo-phone-number-privacy/packages/ packages/
 COPY --from=packages celo-phone-number-privacy/apps/${PACKAGE_SELECTOR} apps/${PACKAGE_SELECTOR}
 

diff --git a/dockerfiles/Dockerfile-loadtest b/dockerfiles/Dockerfile-loadtest
@@ -24,9 +24,7 @@ COPY .yarn/releases/ .yarn/releases/
 # Makes build fail if it doesn't copy git, will be removed after build
 COPY .git .git
 
-# I dont get how this was supposed to work
-ARG ONLY_PUBLISHED_DEPENDENCIES=""
-ARG PACKAGE_SELECTOR=${ONLY_PUBLISHED_DEPENDENCIES:+apps/monitor}
+ARG PACKAGE_SELECTOR=monitor
 COPY --from=packages celo-phone-number-privacy/apps/${PACKAGE_SELECTOR} apps/${PACKAGE_SELECTOR}
 # COMMENT OUT THIS LINE TO USE PUBLISHED DEPENDENCIES
 COPY --from=packages celo-phone-number-privacy/packages packages

diff --git a/dockerfiles/Dockerfile-signer b/dockerfiles/Dockerfile-signer
@@ -24,12 +24,9 @@ COPY .yarn/releases/ .yarn/releases/
 # Makes build fail if it doesn't copy git, will be removed after build
 COPY .git .git
 
-# Setting ONLY_PUBLISHED_DEPENDENCIES to true or any non-empty string results in only the
-# phone-number-privacy package being copied into the image, and therefore it will only build using
-# published dependencies. Setting ONLY_PUBLISHED_DEPENDENCIES to "" will copy in all dependecies.
-ARG ONLY_PUBLISHED_DEPENDENCIES=""
-ARG PACKAGE_SELECTOR=${ONLY_PUBLISHED_DEPENDENCIES:+apps/signer}
+ARG PACKAGE_SELECTOR=signer
 COPY --from=packages celo-phone-number-privacy/apps/${PACKAGE_SELECTOR} apps/${PACKAGE_SELECTOR}
+# COMMENT OUT THIS LINE TO USE PUBLISHED DEPENDENCIES
 COPY --from=packages celo-phone-number-privacy/packages packages
 # Install dependencies and build. need dev deps too so  we can build (tsc)
 RUN yarn install --network-timeout 100000  --inline-builds && yarn cache clean