arm64 and amd64 image

campsych · Mar 21, 2024 · 61209cf · 61209cf
1 parent 2f7ec16
commit 61209cf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/ubuntu:20.04
+FROM ubuntu:20.04
 MAINTAINER Przemyslaw Lis <przemek@concertoplatform.com>
 
 ARG CRAN_MIRROR=https://cloud.r-project.org

diff --git a/build/github-actions/docker-compose.yml b/build/github-actions/docker-compose.yml
@@ -3,7 +3,6 @@ services:
     concerto:
       build: .
       container_name: concerto
-      platform: linux/arm64
       environment:
         - DB_TEST_HOST=127.0.0.1
         - DB_TEST_PORT=3306

diff --git a/build/github-actions/docker_build.sh b/build/github-actions/docker_build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PLATFORM="linux/arm64"
+PLATFORM="linux/amd64,linux/arm64"
 
 if [[ -n $GITHUB_REF_NAME ]]
 then