Skip to content
Merged
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
12 changes: 6 additions & 6 deletions dev/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
image: docker.io/library/postgres:17
container_name: fyra-postgres
ports:
- "5432:5432"
- "127.0.0.1:5432:5432"
environment:
POSTGRES_PASSWORD: mysecretpassword
volumes:
Expand All @@ -19,7 +19,7 @@ services:
container_name: fyra-vyos
privileged: true
ports:
- "8443:443"
- "127.0.0.1:8443:443"
volumes:
- /lib/modules:/lib/modules:ro
networks:
Expand All @@ -30,7 +30,7 @@ services:
container_name: fyra-snippets
command: sh -c "mkdir -p /shared/stack/snippets && chmod -R 777 /shared/stack && exec nginx -g 'daemon off;'"
ports:
- "8005:80"
- "127.0.0.1:8005:80"
volumes:
- ./pve/snippets-nginx.conf:/etc/nginx/conf.d/default.conf:ro,z
- pve_shared:/shared
Expand Down Expand Up @@ -63,7 +63,7 @@ services:
environment:
PASSWORD: fyradev
ports:
- "8006:8006"
- "127.0.0.1:8006:8006"
volumes:
- pve1_data:/var/lib/vz
- pve1_config:/var/lib/pve-cluster
Expand All @@ -84,7 +84,7 @@ services:
environment:
PASSWORD: fyradev
ports:
- "8007:8006"
- "127.0.0.1:8007:8006"
volumes:
- pve2_data:/var/lib/vz
- pve2_config:/var/lib/pve-cluster
Expand All @@ -105,7 +105,7 @@ services:
environment:
PASSWORD: fyradev
ports:
- "8008:8006"
- "127.0.0.1:8008:8006"
volumes:
- pve3_data:/var/lib/vz
- pve3_config:/var/lib/pve-cluster
Expand Down
3 changes: 2 additions & 1 deletion dev/vyos/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ RUN apk add --no-cache libarchive-tools squashfs-tools
ARG ISO
COPY ${ISO} /tmp/vyos.iso
RUN bsdtar -xf /tmp/vyos.iso -C /tmp live/filesystem.squashfs && \
unsquashfs -no-exit-code -d /rootfs /tmp/live/filesystem.squashfs
unsquashfs -no-exit-code -d /rootfs /tmp/live/filesystem.squashfs && \
sed -i '/^ console {$/,/^ }$/d' /rootfs/usr/share/vyos/config.boot.default

FROM scratch
COPY --from=extract /rootfs/ /
Expand Down