From a89ff96d37706c5e8c38a4b1297d3c58b286b56b Mon Sep 17 00:00:00 2001 From: Emile Nijssen Date: Sun, 17 Dec 2023 22:37:34 +0100 Subject: [PATCH] =?UTF-8?q?weejewel=20=E2=86=92=20wg-easy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-nightly.yml | 25 ++++++++++++++----------- README.md | 26 +++++++++++++------------- docker-compose.yml | 2 +- src/www/index.html | 2 +- src/www/js/app.js | 2 +- 5 files changed, 30 insertions(+), 27 deletions(-) diff --git a/.github/workflows/deploy-nightly.yml b/.github/workflows/deploy-nightly.yml index efff952..7a573f0 100644 --- a/.github/workflows/deploy-nightly.yml +++ b/.github/workflows/deploy-nightly.yml @@ -1,4 +1,4 @@ -name: Build & Publish Docker Image to Docker Hub +name: Build & Publish Nightly Docker Image to GitHub Container Registry on: workflow_dispatch: @@ -9,8 +9,11 @@ jobs: deploy: name: Build & Deploy runs-on: ubuntu-latest + permissions: + packages: write + contents: read steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: ref: production @@ -20,19 +23,19 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub - uses: docker/login-action@v1 + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - # Set environment variables - - run: echo RELEASE=$(cat ./src/package.json | jq -r .release) >> $GITHUB_ENV + - name: Set environment variables + run: echo RELEASE=$(cat ./src/package.json | jq -r .release) >> $GITHUB_ENV - # Build & Publish - name: Build & Publish Docker Image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: push: true platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8 - tags: weejewel/wg-easy:nightly, weejewel/wg-easy:${{ env.RELEASE }}-nightly + tags: ghcr.io/wg-easy/wg-easy:nightly, ghcr.io/wg-easy/wg-easy:${{ env.RELEASE }}-nightly diff --git a/README.md b/README.md index e841aff..0e2d397 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # WireGuard Easy -[![Build & Publish Docker Image to Docker Hub](https://github.com/WeeJeWel/wg-easy/actions/workflows/deploy.yml/badge.svg?branch=production)](https://github.com/WeeJeWel/wg-easy/actions/workflows/deploy.yml) -[![Lint](https://github.com/WeeJeWel/wg-easy/actions/workflows/lint.yml/badge.svg?branch=master)](https://github.com/WeeJeWel/wg-easy/actions/workflows/lint.yml) -[![Docker](https://img.shields.io/docker/v/weejewel/wg-easy/latest)](https://hub.docker.com/r/weejewel/wg-easy) -[![Docker](https://img.shields.io/docker/pulls/weejewel/wg-easy.svg)](https://hub.docker.com/r/weejewel/wg-easy) +[![Build & Publish Docker Image to Docker Hub](https://github.com/wg-easy/wg-easy/actions/workflows/deploy.yml/badge.svg?branch=production)](https://github.com/wg-easy/wg-easy/actions/workflows/deploy.yml) +[![Lint](https://github.com/wg-easy/wg-easy/actions/workflows/lint.yml/badge.svg?branch=master)](https://github.com/wg-easy/wg-easy/actions/workflows/lint.yml) +[![Docker](https://img.shields.io/docker/v/wg-easy/wg-easy/latest)](https://hub.docker.com/r/wg-easy/wg-easy) +[![Docker](https://img.shields.io/docker/pulls/wg-easy/wg-easy.svg)](https://hub.docker.com/r/wg-easy/wg-easy) [![Sponsor](https://img.shields.io/github/sponsors/weejewel)](https://github.com/sponsors/WeeJeWel) -![GitHub Stars](https://img.shields.io/github/stars/weejewel/wg-easy) +![GitHub Stars](https://img.shields.io/github/stars/wg-easy/wg-easy) You have found the easiest way to install & manage WireGuard on any Linux host! @@ -60,7 +60,7 @@ $ docker run -d \ --sysctl="net.ipv4.conf.all.src_valid_mark=1" \ --sysctl="net.ipv4.ip_forward=1" \ --restart unless-stopped \ - weejewel/wg-easy + ghcr.io/wg-easy/wg-easy > 💡 Replace `YOUR_SERVER_IP` with your WAN IP, or a Dynamic DNS hostname. @@ -90,10 +90,10 @@ These options can be configured by setting environment variables using `-e KEY=" | `WG_DEFAULT_ADDRESS` | `10.8.0.x` | `10.6.0.x` | Clients IP address range. | | `WG_DEFAULT_DNS` | `1.1.1.1` | `8.8.8.8, 8.8.4.4` | DNS server clients will use. | | `WG_ALLOWED_IPS` | `0.0.0.0/0, ::/0` | `192.168.15.0/24, 10.0.1.0/24` | Allowed IPs clients will use. | -| `WG_PRE_UP` | `...` | - | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L19) for the default value. | -| `WG_POST_UP` | `...` | `iptables ...` | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L20) for the default value. | -| `WG_PRE_DOWN` | `...` | - | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L27) for the default value. | -| `WG_POST_DOWN` | `...` | `iptables ...` | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L28) for the default value. | +| `WG_PRE_UP` | `...` | - | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L19) for the default value. | +| `WG_POST_UP` | `...` | `iptables ...` | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L20) for the default value. | +| `WG_PRE_DOWN` | `...` | - | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L27) for the default value. | +| `WG_POST_DOWN` | `...` | `iptables ...` | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L28) for the default value. | > If you change `WG_PORT`, make sure to also change the exposed port. @@ -104,12 +104,12 @@ To update to the latest version, simply run: ```bash docker stop wg-easy docker rm wg-easy -docker pull weejewel/wg-easy +docker pull ghcr.io/wg-easy/wg-easy ``` And then run the `docker run -d \ ...` command above again. ## Common Use Cases -* [Using WireGuard-Easy with Pi-Hole](https://github.com/WeeJeWel/wg-easy/wiki/Using-WireGuard-Easy-with-Pi-Hole) -* [Using WireGuard-Easy with nginx/SSL](https://github.com/WeeJeWel/wg-easy/wiki/Using-WireGuard-Easy-with-nginx-SSL) +* [Using WireGuard-Easy with Pi-Hole](https://github.com/wg-easy/wg-easy/wiki/Using-WireGuard-Easy-with-Pi-Hole) +* [Using WireGuard-Easy with nginx/SSL](https://github.com/wg-easy/wg-easy/wiki/Using-WireGuard-Easy-with-nginx-SSL) diff --git a/docker-compose.yml b/docker-compose.yml index 9842b26..489825b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: # - WG_PRE_DOWN=echo "Pre Down" > /etc/wireguard/pre-down.txt # - WG_POST_DOWN=echo "Post Down" > /etc/wireguard/post-down.txt - image: weejewel/wg-easy + image: ghcr.io/wg-easy/wg-easy container_name: wg-easy volumes: - .:/etc/wireguard diff --git a/src/www/index.html b/src/www/index.html index 7d5da28..b74798f 100644 --- a/src/www/index.html +++ b/src/www/index.html @@ -513,7 +513,7 @@

Made by Emile Nijssen · Donate · GitHub

+ href="https://github.com/wg-easy/wg-easy" target="_blank">GitHub

diff --git a/src/www/js/app.js b/src/www/js/app.js index e22cbfe..f95785b 100644 --- a/src/www/js/app.js +++ b/src/www/js/app.js @@ -270,7 +270,7 @@ new Vue({ Promise.resolve().then(async () => { const currentRelease = await this.api.getRelease(); - const latestRelease = await fetch('https://weejewel.github.io/wg-easy/changelog.json') + const latestRelease = await fetch('https://wg-easy.github.io/wg-easy/changelog.json') .then(res => res.json()) .then(releases => { const releasesArray = Object.entries(releases).map(([version, changelog]) => ({