Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Meilleur gestion M1 #192

Merged
merged 2 commits into from
Aug 12, 2024
Merged

Meilleur gestion M1 #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f563956
fix: ajout de paramétrage pour gérer les M1 plus proprement
jenovateurs Aug 7, 2024
1444bb6
fix: problème d'indentation
jenovateurs Aug 12, 2024
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
2 changes: 1 addition & 1 deletion local/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM debian:11.6
ENV container docker
ENV container=docker

RUN apt-get update -y && apt-get dist-upgrade -y
RUN apt-get install -y --no-install-recommends ssh sudo wget curl cron software-properties-common build-essential libffi-dev systemd openssh-client net-tools
Expand Down
23 changes: 17 additions & 6 deletions local/Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,24 @@ Vagrant.configure("2") do |config|
end

config.vm.provider "docker" do |docker, override|
override.vm.box = nil
docker.build_dir = "."
override.ssh.insert_key = true
docker.has_ssh = true
docker.privileged = true
override.vm.box = nil
docker.build_dir = "."

platform = `uname -m`.strip

# Conditional arguments for ARM64 platform
if platform == "arm64" || platform == "aarch64"
docker.build_args = "--platform=linux/arm64"
docker.create_args = ["--platform=linux/arm64"]
end

docker.build_args = "--platform=linux/arm64"
docker.name = "ctn_aides_jeunes"
override.ssh.insert_key = true
docker.has_ssh = true
docker.privileged = true
docker.ports = ["8001:8001", "2001:2001", "8002:8002", "2002:2002", "8887:8887"]
end
end

# Faster startup
config.vm.synced_folder ".", "/vagrant", disabled: true
Expand Down
Loading