From 008a2ab1236124599e5a7931c4b28a8dfcc8d753 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sat, 11 Dec 2021 20:58:09 +0100 Subject: [PATCH] Support arm64 (#465) * Support arm64 * Move prisma from devDependencies to dependencies (Fix "/bin/sh: prisma: not found" in docker build) * Update changelog Co-authored-by: Valentin Zickner --- CHANGELOG.md | 7 +++++++ Dockerfile | 3 ++- package.json | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dce01bc7e..0b962f1f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleasd + +### Fixed + +- Fixed `/bin/sh: prisma: not found` in docker build +- Added `apk` in `Dockerfile` (`python3 g++ make openssl`) + ## 1.89.0 - 11.12.2021 ### Added diff --git a/Dockerfile b/Dockerfile index 995102f2e..075b43396 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,8 @@ COPY ./package.json package.json COPY ./yarn.lock yarn.lock COPY ./prisma/schema.prisma prisma/schema.prisma -RUN yarn +RUN apk add --no-cache python3 g++ make openssl +RUN yarn install # See https://github.com/nrwl/nx/issues/6586 for further details COPY ./decorate-angular-cli.js decorate-angular-cli.js diff --git a/package.json b/package.json index 168d8c969..3dbf64da1 100644 --- a/package.json +++ b/package.json @@ -105,6 +105,7 @@ "passport": "0.4.1", "passport-google-oauth20": "2.0.0", "passport-jwt": "4.0.0", + "prisma": "3.6.0", "reflect-metadata": "0.1.13", "round-to": "5.0.0", "rxjs": "7.4.0", @@ -161,7 +162,6 @@ "jest": "27.2.3", "jest-preset-angular": "11.0.0", "prettier": "2.3.2", - "prisma": "3.6.0", "replace-in-file": "6.2.0", "rimraf": "3.0.2", "ts-jest": "27.0.5",