asd

nhost · Aug 16, 2023 · 7c77099 · 7c77099
1 parent 9ae8f85
commit 7c77099
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -53,12 +53,27 @@ build-docker-image:  ## Build docker container for native architecture
 	./build/nix-docker-image.sh
 	docker tag hasura-storage:$(VERSION) hasura-storage:dev
 
-.PHONY: build-docker-image-clamav
-build-docker-image-clamav:  ## Build docker container for clamav
+.PHONY: build-docker-image-clamav-dev
+build-docker-image-clamav-dev:  ## Build dev docker container for clamav
 	@echo $(VERSION) > VERSION
 	./build/nix-docker-image.sh clamavDockerImage
 	docker tag clamav:$(VERSION) clamav:dev
 
+.PHONY: build-docker-image-clamav
+build-docker-image-clamav:  ## Build docker container for clamav
+	@echo $(VERSION) > VERSION
+	./build/nix-docker-image.sh clamavDockerImage aarch64-linux
+	docker tag clamav:$(VERSION) nhost/clamav:$(VERSION)-aarch64
+	./build/nix-docker-image.sh clamavDockerImage x86_64-linux
+	docker tag clamav:$(VERSION) nhost/clamav:$(VERSION)-x86_64
+	docker push nhost/clamav:$(VERSION)-aarch64
+	docker push nhost/clamav:$(VERSION)-x86_64
+	docker manifest create \
+	  nhost/clamav:$(VERSION) \
+	    --amend nhost/clamav:$(VERSION)-aarch64 \
+	    --amend nhost/clamav:$(VERSION)-x86_64
+	docker manifest push nhost/clamav:$(VERSION)
+
 
 .PHONY: dev-env-up-short
 dev-env-up-short:  ## Starts development environment without hasura-storage

diff --git a/build/dev/docker/docker-compose.yaml b/build/dev/docker/docker-compose.yaml
@@ -66,7 +66,7 @@ services:
 
   clamd:
     container_name: hasura-storage-clamd
-    image: clamav:0.0.0-dev
+    image: nhost/clamav:0.0.1
     restart: unless-stopped
     ports:
       - '3310:3310'
diff --git a/build/nix-docker-image.sh b/build/nix-docker-image.sh
@@ -3,16 +3,19 @@
 which nix > /dev/null
 
 IMAGE=${1:-"dockerImage"}
+SYSTEM=${2:-""}
 
 if [[ $NIX_BUILD_NATIVE -eq 1 ]]; then
-    case $(uname -m) in
-    "arm64")
-        SYSTEM="aarch64-linux"
-        ;;
-    *)
-        SYSTEM="x86_64-linux"
-        ;;
-    esac
+    if [[ -z $SYSTEM ]]; then
+        case $(uname -m) in
+        "arm64")
+            SYSTEM="aarch64-linux"
+            ;;
+        *)
+            SYSTEM="x86_64-linux"
+            ;;
+        esac
+    fi
 
     nix build .\#packages.${SYSTEM}.$IMAGE --print-build-logs && docker load < result
     exit $?
@@ -30,4 +33,4 @@ docker run --rm -it \
     -w /build \
     --entrypoint sh \
     dbarroso/nix:2.6.0 \
-        -c "nix build .\\#$IMAGE --print-build-logs && docker load < result"
+        -c "nix build .\\#packages.$IMAGE --print-build-logs && docker load < result"
diff --git a/flake.nix b/flake.nix
@@ -206,12 +206,6 @@
 
         };
 
-        apps = flake-utils.lib.flattenTree {
-          hasuraStorage = self.packages.${system}.hasuraStorage;
-          golangci-lint = pkgs.golangci-lint;
-          default = self.packages.${system}.hasuraStorage;
-        };
-
       }