From b8aa7b6d08f093ee2c036bedfab6da2e38ca62ee Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 20 Apr 2022 15:15:18 +0200 Subject: [PATCH] Internal changes --- data/build-prisma-engine.sh | 1 - data/prisma/build-prisma-engine.sh | 1 + data/{ => prisma}/prisma-engine.Dockerfile | 2 +- package.json | 2 ++ 4 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 data/build-prisma-engine.sh create mode 100644 data/prisma/build-prisma-engine.sh rename data/{ => prisma}/prisma-engine.Dockerfile (87%) diff --git a/data/build-prisma-engine.sh b/data/build-prisma-engine.sh deleted file mode 100644 index 42c2af608..000000000 --- a/data/build-prisma-engine.sh +++ /dev/null @@ -1 +0,0 @@ -nohup docker build -t coollabsio/prisma-engine: --push . & \ No newline at end of file diff --git a/data/prisma/build-prisma-engine.sh b/data/prisma/build-prisma-engine.sh new file mode 100644 index 000000000..4c0757d39 --- /dev/null +++ b/data/prisma/build-prisma-engine.sh @@ -0,0 +1 @@ +docker build --platform linux/amd64,linux/arm64 -t coollabsio/prisma-engine -f prisma-engine.Dockerfile --push . \ No newline at end of file diff --git a/data/prisma-engine.Dockerfile b/data/prisma/prisma-engine.Dockerfile similarity index 87% rename from data/prisma-engine.Dockerfile rename to data/prisma/prisma-engine.Dockerfile index 086472e23..76d1204fb 100644 --- a/data/prisma-engine.Dockerfile +++ b/data/prisma/prisma-engine.Dockerfile @@ -2,7 +2,7 @@ FROM rust:1.58.1-alpine3.14 as prisma WORKDIR /prisma ENV RUSTFLAGS="-C target-feature=-crt-static" RUN apk --no-cache add openssl direnv git musl-dev openssl-dev build-base perl protoc -RUN git clone --depth=1 --branch=3.11.x https://github.com/prisma/prisma-engines.git /prisma +RUN git clone --depth=1 --branch=3.12.x https://github.com/prisma/prisma-engines.git /prisma RUN cargo build --release FROM alpine diff --git a/package.json b/package.json index bb3348d88..ca2dc0d2a 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,10 @@ "db:migrate": "COOLIFY_DATABASE_URL=file:../db/migration.db prisma migrate dev --skip-seed --name", "release:production:all": "cross-var docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest --push .", "release:production:amd": "cross-var docker build --platform linux/amd64 -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest --push .", + "release:production:arm": "cross-var docker build --platform linux/arm64 -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest --push .", "release:staging:all": "cross-var docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify:$npm_package_version --push .", "release:staging:amd": "cross-var docker build --platform linux/amd64 -t coollabsio/coolify:$npm_package_version --push .", + "release:staging:arm": "cross-var docker build --platform linux/arm64 -t coollabsio/coolify:$npm_package_version --push .", "release:haproxy": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-alpine:latest -t coollabsio/coolify-haproxy-alpine:1.1.0 -f data/haproxy.Dockerfile --push .", "release:haproxy:tcp": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-tcp-alpine:latest -t coollabsio/coolify-haproxy-tcp-alpine:1.1.0 -f data/haproxy-tcp.Dockerfile --push .", "release:haproxy:http": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-http-alpine:latest -t coollabsio/coolify-haproxy-http-alpine:1.1.0 -f data/haproxy-http.Dockerfile --push .",