feat: add environment file for configuring docker compose (guacsec#901)

* feat: add environment file for configuring docker compose Signed-off-by: Dejan Bosanac <[email protected]> * fix: test data Signed-off-by: Dejan Bosanac <[email protected]> --------- Signed-off-by: Dejan Bosanac <[email protected]>
ctron · Jun 13, 2023 · 4afe4f6 · 4afe4f6
1 parent 484051c
commit 4afe4f6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/.env b/.env
@@ -0,0 +1,5 @@
+GUAC_IMAGE=local-organic-guac
+#GUAC_IMAGE=ghcr.io/guacsec/guac:v0.1.0
+GUAC_HEALTH_IMAGE=local-healthcheck
+#GUAC_HEALTH_IMAGE=ghcr.io/guacsec/healthcheck:v0.1.0
+GUAC_API_PORT=8080
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
   # it doesn't have utilities within it to perform the check from the container
   # itself.
   service-health-1:
-    image: "local-healthcheck"
+    image: $GUAC_HEALTH_IMAGE
     stdin_open: true
     tty: true
     command:
@@ -50,7 +50,7 @@ services:
         # echo "neo4j-up";
 
   guac-collectsub:
-    image: "local-organic-guac"
+    image: $GUAC_IMAGE
     command: "/opt/guac/guaccsub"
     working_dir: /guac
     restart: on-failure
@@ -63,21 +63,21 @@ services:
       - ./container_files/guac:/guac
 
   guac-graphql:
-    image: "local-organic-guac"
+    image: $GUAC_IMAGE
     command: "/opt/guac/guacgql"
     working_dir: /guac
     restart: on-failure
     depends_on:
       service-health-1:
         condition: service_completed_successfully
     ports:
-      - "8080:8080"
+      - "$GUAC_API_PORT:8080"
     volumes:
       - ./container_files/guac:/guac
 
   # GUAC ingestor and oci collector are dependent on the collectsub service to be up
   service-health-2:
-    image: "local-healthcheck"
+    image: $GUAC_HEALTH_IMAGE
     stdin_open: true
     tty: true
     command:
@@ -96,7 +96,7 @@ services:
 
 
   guac-ingestor:
-    image: "local-organic-guac"
+    image: $GUAC_IMAGE
     command: "/opt/guac/guacingest"
     working_dir: /guac
     restart: on-failure
@@ -108,7 +108,7 @@ services:
 
 
   oci-collector:
-    image: "local-organic-guac"
+    image: $GUAC_IMAGE
     command: "/opt/guac/guaccollect image"
     working_dir: /guac
     restart: on-failure
@@ -118,7 +118,7 @@ services:
     volumes:
       - ./container_files/guac:/guac
   depsdev-collector:
-    image: "local-organic-guac"
+    image: $GUAC_IMAGE
     command: "/opt/guac/guaccollect deps_dev"
     working_dir: /guac
     restart: on-failure
@@ -130,7 +130,7 @@ services:
     volumes:
       - ./container_files/guac:/guac
   osv-certifier:
-    image: "local-organic-guac"
+    image: $GUAC_IMAGE
     command: "/opt/guac/guacone certifier osv"
     working_dir: /guac
     restart: on-failure

diff --git a/internal/testing/testdata/testdata.go b/internal/testing/testdata/testdata.go
@@ -1127,7 +1127,7 @@ var (
 				 "qualifiers":null,
 				 "subpath":"",
 				 "type":"pypi",
-				 "version":"3.12.1"
+				 "version":"3.12.2"
 			  },
 			  "DepPackages":null,
 			  "IsDepPackages":null,
@@ -1219,7 +1219,7 @@ var (
 				 "qualifiers":null,
 				 "subpath":"",
 				 "type":"pypi",
-				 "version":"3.12.1"
+				 "version":"3.12.2"
 			  },
 			  "IsDependency":{
 				 "collector":"",