From 61209cf8f32907181089854b8d585f2778bd820a Mon Sep 17 00:00:00 2001 From: przemyslaw_lis Date: Thu, 21 Mar 2024 12:16:15 +0100 Subject: [PATCH] arm64 and amd64 image --- Dockerfile | 2 +- build/github-actions/docker-compose.yml | 1 - build/github-actions/docker_build.sh | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 99369ee4..a45c67c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/ubuntu:20.04 +FROM ubuntu:20.04 MAINTAINER Przemyslaw Lis ARG CRAN_MIRROR=https://cloud.r-project.org diff --git a/build/github-actions/docker-compose.yml b/build/github-actions/docker-compose.yml index eacfcfc9..024c4bc2 100644 --- 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 index 1804fc91..345593b4 100644 --- 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