From 428daf306e8c44705e5fd4e420e0eced16ba6b2f Mon Sep 17 00:00:00 2001 From: soup-bowl Date: Mon, 30 Jan 2023 17:33:16 +0000 Subject: [PATCH] Cleanup. --- .github/workflows/build-beta.yml | 36 ++++++++-------- .github/workflows/build-main.yml | 54 ++++++++++++------------ .github/workflows/update-docker-desc.yml | 22 +++++----- beta/alpine/docker-compose.yml | 6 +-- build/main/docker-entrypoint.sh | 2 +- 5 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml index b4136fe..869d192 100644 --- a/.github/workflows/build-beta.yml +++ b/.github/workflows/build-beta.yml @@ -3,32 +3,32 @@ name: Build Beta Container on: push: branches: - - main + - main paths: - - "beta/**" + - "beta/**" workflow_dispatch: jobs: build: runs-on: ubuntu-latest steps: - - name: Checkout Codebase - uses: actions/checkout@v2 + - name: Checkout Codebase + uses: actions/checkout@v2 - - name: Login to ghcr.io - run: echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u soup-bowl --password-stdin + - name: Login to ghcr.io + run: echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u soup-bowl --password-stdin - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v1 + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 - - name: Build Container - uses: docker/build-push-action@v2 - with: - push: true - context: "{{defaultContext}}:build/main" - tags: ghcr.io/soup-bowl/opensimulator-docker:alpine-beta - platforms: linux/amd64 + - name: Build Container + uses: docker/build-push-action@v2 + with: + push: true + context: "{{defaultContext}}:build/main" + tags: ghcr.io/soup-bowl/opensimulator-docker:alpine-beta + platforms: linux/amd64 diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml index fd317c4..9a72388 100644 --- a/.github/workflows/build-main.yml +++ b/.github/workflows/build-main.yml @@ -3,42 +3,42 @@ name: Build Main Container on: push: branches: - - main + - main paths: - - "build/**" + - "build/**" workflow_dispatch: jobs: build: runs-on: ubuntu-latest steps: - - name: Checkout Codebase - uses: actions/checkout@v2 + - name: Checkout Codebase + uses: actions/checkout@v2 - - name: Login to ghcr.io - run: echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u soup-bowl --password-stdin + - name: Login to ghcr.io + run: echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u soup-bowl --password-stdin - - name: Login to Docker Hub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USER }} - password: ${{ secrets.DOCKER_SECRET }} + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USER }} + password: ${{ secrets.DOCKER_SECRET }} - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v1 + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 - - name: Build Container - uses: docker/build-push-action@v2 - with: - push: true - context: "{{defaultContext}}:build/main" - tags: > - soupbowl/opensimulator:latest, - soupbowl/opensimulator:edge, - ghcr.io/soup-bowl/opensimulator-docker:latest, - ghcr.io/soup-bowl/opensimulator-docker:edge - platforms: linux/amd64,linux/arm64 + - name: Build Container + uses: docker/build-push-action@v2 + with: + push: true + context: "{{defaultContext}}:build/main" + tags: > + soupbowl/opensimulator:latest, + soupbowl/opensimulator:edge, + ghcr.io/soup-bowl/opensimulator-docker:latest, + ghcr.io/soup-bowl/opensimulator-docker:edge + platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/update-docker-desc.yml b/.github/workflows/update-docker-desc.yml index 03cebb2..036be7d 100644 --- a/.github/workflows/update-docker-desc.yml +++ b/.github/workflows/update-docker-desc.yml @@ -3,21 +3,21 @@ name: Update DockerHub Description on: push: branches: - - main + - main paths: - - "README.md" + - "README.md" workflow_dispatch: jobs: build: runs-on: ubuntu-latest steps: - - name: Checkout Codebase - uses: actions/checkout@v2 - - - name: Docker Hub Description - uses: peter-evans/dockerhub-description@v3 - with: - username: ${{ secrets.DOCKER_USER }} - password: ${{ secrets.DOCKER_SECRET }} - repository: soupbowl/opensimulator + - name: Checkout Codebase + uses: actions/checkout@v2 + + - name: Docker Hub Description + uses: peter-evans/dockerhub-description@v3 + with: + username: ${{ secrets.DOCKER_USER }} + password: ${{ secrets.DOCKER_SECRET }} + repository: soupbowl/opensimulator diff --git a/beta/alpine/docker-compose.yml b/beta/alpine/docker-compose.yml index 6e907e8..3f170fb 100644 --- a/beta/alpine/docker-compose.yml +++ b/beta/alpine/docker-compose.yml @@ -3,7 +3,7 @@ services: db: image: docker.io/library/mariadb:10.5 volumes: - - "database_store:/var/lib/mysql" + - "database_store:/var/lib/mysql" environment: MYSQL_DATABASE: metaverse MYSQL_ROOT_PASSWORD: password @@ -13,8 +13,8 @@ services: depends_on: - db ports: - - "9000:9000" - - "9000:9000/udp" + - "9000:9000" + - "9000:9000/udp" environment: DATABASE_ENGINE: mysql MYSQL_SERVER: db diff --git a/build/main/docker-entrypoint.sh b/build/main/docker-entrypoint.sh index 84b4e43..b062fc0 100755 --- a/build/main/docker-entrypoint.sh +++ b/build/main/docker-entrypoint.sh @@ -57,6 +57,6 @@ if [ `find Regions -maxdepth 1 -name '*.ini' | wc -l` -eq 0 ]; then InternalPort = 9000 AllowAlternatePorts = False ExternalHostName = localhost" >> Regions/Regions.ini -fi +fi exec "$@"