Skip to content

feature: add back arm support #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/beta-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ jobs:
file: "./docker/PythonDockerfile"
platforms: |
linux/amd64
linux/arm64
# Note: tags have to be all lower-case
tags: ${{ steps.meta_python.outputs.tags }}
labels: ${{ steps.meta_python.outputs.labels }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ jobs:
file: "./docker/PythonDockerfile"
platforms: |
linux/amd64
linux/arm64
# Note: tags have to be all lower-case
tags: ${{ steps.meta_python.outputs.tags }}
labels: ${{ steps.meta_python.outputs.labels }}
Expand Down
92 changes: 0 additions & 92 deletions docker-compose-dev-macos.yml

This file was deleted.

8 changes: 6 additions & 2 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ services:
restart: unless-stopped
tty: true
healthcheck:
test: ["CMD", 'mysqladmin', 'ping', '-h', 'localhost', '-u', 'root', '-p$MYSQL_ROOT_PASSWORD']
test: ["CMD", 'mysqladmin', 'ping', '-h', 'localhost', '-u', 'root', '-plinguacafe-dev']
interval: 5s
timeout: 5s
retries: 10
Expand All @@ -63,7 +63,7 @@ services:
image: redis:7.2-alpine
container_name: linguacafe-redis-dev
restart: unless-stopped
volumes:
volumes:
- ./cache:/data
ports:
- "6379:6379"
Expand All @@ -82,6 +82,10 @@ services:
- "8678:8678"
build:
dockerfile: ./docker/PythonDockerfileDev
# for testing arm build
# platforms:
# - linux/arm64
# - linux/amd64
volumes:
- ./tools:/app
- ./storage/app:/var/www/html/storage/app
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ services:
restart: unless-stopped
tty: true
healthcheck:
test: ["CMD", 'mysqladmin', 'ping', '-h', 'localhost', '-u', 'root', '-p$MYSQL_ROOT_PASSWORD']
test: ["CMD", 'mysqladmin', 'ping', '-h', 'localhost', '-u', 'root', '-p${DB_ROOT_PASSWORD:-linguacafe}']
interval: 10s
timeout: 5s
retries: 10
Expand All @@ -56,7 +56,7 @@ services:
image: redis:7.2-alpine
container_name: linguacafe-redis
restart: unless-stopped
volumes:
volumes:
- ./cache:/data
ports:
- "6379:6379"
Expand All @@ -78,4 +78,4 @@ services:
- ./storage:/var/www/html/storage
networks:
- linguacafe
platform: ${PLATFORM:-}
platform: ${PLATFORM:-}
10 changes: 9 additions & 1 deletion docker/PythonDockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ FROM ubuntu:22.04

WORKDIR /app
RUN apt-get update -y \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
build-essential \
curl \
gfortran \
liblapack-dev \
libopenblas-dev \
python3 \
python3-dev \
pip \
Expand All @@ -14,7 +19,10 @@ RUN addgroup --gid 1000 laravel \
&& adduser --ingroup laravel --disabled-password --gecos "" --shell /bin/sh laravel
USER laravel

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ENV BLIS_ARCH="generic"
RUN pip install -U --no-cache-dir \
pip \
setuptools \
wheel \
lxml \
Expand Down
10 changes: 9 additions & 1 deletion docker/PythonDockerfileDev
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ FROM ubuntu:22.04

WORKDIR /app
RUN apt-get update -y \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
build-essential \
curl \
gfortran \
liblapack-dev \
libopenblas-dev \
python3 \
python3-dev \
pip \
Expand All @@ -14,7 +19,10 @@ RUN addgroup --gid 1000 laravel \
&& adduser --ingroup laravel --disabled-password --gecos "" --shell /bin/sh laravel
USER laravel

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ENV BLIS_ARCH="generic"
RUN pip install -U --no-cache-dir \
pip \
setuptools \
wheel \
lxml \
Expand Down