aks dev build

HSLdevcom · Apr 23, 2024 · ee2420f · ee2420f
1 parent e5bf1d4
commit ee2420f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml
@@ -59,4 +59,23 @@ jobs:
           name: hsldevcom/transitdata-cache-bootstrapper
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          tag_semver: true
+          tag_semver: true
+  build-aks-dev-docker-image:
+    needs: test
+    runs-on: ubuntu-latest
+    # Run only on aks-dev branch
+    if: github.ref == 'refs/heads/aks-dev'
+    steps:
+      - uses: actions/checkout@v2
+      - name: Download .jar file
+        uses: actions/download-artifact@v2
+        with:
+          name: transitdata-cache-bootstrapper.jar
+          path: target
+      - name: Build and publish aks-dev Docker image
+        uses: elgohr/Publish-Docker-Github-Action@master
+        with:
+          name: hsldevcom/transitdata-cache-bootstrapper
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          tags: aks-dev
diff --git a/src/main/java/fi/hsl/transitdata/pubtransredisconnect/Main.java b/src/main/java/fi/hsl/transitdata/pubtransredisconnect/Main.java
@@ -160,9 +160,7 @@ public static void main(String[] args) {
 
         try {
             //Default path is what works with Docker out-of-the-box. Override with a local file if needed
-            final String secretFilePath = ConfigUtils.getEnv("FILEPATH_CONNECTION_STRING").orElse("/run/secrets/pubtrans_community_conn_string");
-            connectionString = new Scanner(new File(secretFilePath))
-                    .useDelimiter("\\Z").next();
+            connectionString = System.getenv("TRANSITDATA_PUBTRANS_CONN_STRING");
         } catch (Exception e) {
             log.error("Failed to read the DB connection string from the file", e);
         }