diff --git a/.github/workflows/build_only.yml b/.github/workflows/build_only.yml index 805b138..b197956 100644 --- a/.github/workflows/build_only.yml +++ b/.github/workflows/build_only.yml @@ -18,11 +18,13 @@ jobs: platform: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 imageName: ilteoood/docker-surfshark - name: Scan image - uses: anchore/scan-action@master + uses: anchore/scan-action@v2 with: - image-reference: "ilteoood/docker-surfshark:latest" - dockerfile-path: "./Dockerfile" + image: "ilteoood/docker-surfshark:latest" fail-build: true - include-app-packages: true + acs-report-enable: true + severity-cutoff: critical - name: Anchore inline scan JSON results - run: for j in `ls ./anchore-reports/*.json`; do echo "---- ${j} ----"; cat ${j}; echo; done \ No newline at end of file + run: for j in `ls ./anchore-reports/*.json`; do echo "---- ${j} ----"; cat ${j}; echo; done + - name: Inspect action SARIF report + run: cat ${{ steps.scan.outputs.sarif }} \ No newline at end of file diff --git a/README.md b/README.md index 0f634bc..0d00ab9 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ The container is configurable using 5 environment variables: ## Execution You can run this image using [Docker compose](https://docs.docker.com/compose/) and the [sample file](./docker-compose.yml) provided. +** Remember: if you want to use the web gui of a container, you must open its ports on `docker-surfshark` as described below. ** ``` version: "2" @@ -58,6 +59,8 @@ services: - NET_ADMIN devices: - /dev/net/tun + ports: + - 9091:9091 #we open here the port for transmission, as this container will be the access point for the others restart: unless-stopped dns: - 1.1.1.1 @@ -69,6 +72,17 @@ services: - surfshark network_mode: service:surfshark restart: always + transmission: + image: linuxserver/transmission + container_name: transmission + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Rome + #ports: + #- 9091:9091 needed to access transmission's GUI + network_mode: service:surfshark + restart: unless-stopped ``` Or you can use the standard `docker run` command. diff --git a/docker-compose.yml b/docker-compose.yml index e2acd59..c58e9eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,12 +11,12 @@ services: - SURFSHARK_CITY=mil - CONNECTION_TYPE=udp - LAN_NETWORK=192.168.0.0/24 #Optional - Used to access attached containers web ui - ports: - - 1880:1880 #Optional - Used to access attached containers web ui cap_add: - NET_ADMIN devices: - /dev/net/tun + ports: + - 9091:9091 #We open here the port for transmission, as this container will be the access point for the others restart: unless-stopped dns: - 1.1.1.1 @@ -28,4 +28,14 @@ services: - surfshark network_mode: service:surfshark restart: always - + transmission: + image: linuxserver/transmission + container_name: transmission + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/Rome + #ports: + #- 9091:9091 needed to access transmission's GUI + network_mode: service:surfshark + restart: unless-stopped