diff --git a/dev/compose.yaml b/dev/compose.yaml index 507b478..f21a7e8 100644 --- a/dev/compose.yaml +++ b/dev/compose.yaml @@ -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: @@ -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: @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/dev/vyos/Containerfile b/dev/vyos/Containerfile index 51cb0b6..0e26d7e 100644 --- a/dev/vyos/Containerfile +++ b/dev/vyos/Containerfile @@ -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/ /