use alpine container and cleanup repo root dir #42

Merged
ben merged 1 commits from cleanup into main 2022-11-07 01:29:35 +00:00
8 changed files with 23 additions and 32 deletions

6
.dockerignore Normal file
View File

@ -0,0 +1,6 @@
Dockerfile
.git/
.gitignore
.dockerignore
docs/img/
*.md

View File

@ -1,8 +1,10 @@
FROM benediktkr/poetry:3.9 FROM python:3.10-alpine
RUN adduser --disabled-password --uid 1000 infra && \
apk add --update --no-cache yamllint
USER 0
RUN python3 -m pip install yamllint
COPY . /infra
WORKDIR /infra WORKDIR /infra
USER infra
COPY --chown=infra:infra . /infra
CMD ["/infra/lint.sh", "/infra"] ENTRYPOINT ["/infra/bin/lint.sh", "/infra"]

View File

10
bin/lint.sh Executable file
View File

@ -0,0 +1,10 @@
#!/bin/sh
echo "output is currently redirected to /dev/null"
yamllint $1 &>/dev/null
returncode=$?
echo "yamllint returncode: $returncode"
exit 0

View File

@ -1,22 +0,0 @@
set interfaces switch switch0 vif 10 address 192.168.2.1/24
set service dhcp-server shared-network-name vlan10 subnet 192.168.2.0/24 start 192.168.2.11 stop 192.168.2.200
set service dhcp-server shared-network-name vlan10 subnet 192.168.2.0/24 default-router 192.168.2.1
set service dhcp-server shared-network-name vlan10 subnet 192.168.2.0/24 dns-server 192.168.2.1
set interfaces switch switch0 switch-port vlan-aware enable
set interfaces switch switch0 switch-port interface eth1 vlan vid 10
# Don't mess with the untagged/physical part since we're not using a dedicated vlan for the rest
# set interfaces switch switch0 switch-port interface eth1 vlan pvid 1
set interfaces openvpn vtun0 config-file /config/wifi002.conf
set firewall modify SOURCE_ROUTE rule 1 action modify
set firewall modify SOURCE_ROUTE rule 1 description "traffic from vlan goes to vpn"
set firewall modify SOURCE_ROUTE rule 1 modify table 1
set firewall modify SOURCE_ROUTE rule 1 source address 192.168.2.0/24
set protocols static table 1 interface-route 0.0.0.0/0 next-hop-interface vtun0
set interfaces switch switch0 vif 10 firewall in modify SOURCE_ROUTE

View File

@ -1,5 +0,0 @@
#!/bin/bash
yamllint $1
exit 0