Compare commits

...

11 Commits

Author SHA1 Message Date
340b5967f2 always latest
Some checks failed
Build / Build Image (push) Failing after 48s
2023-06-21 19:36:23 +02:00
690a95e878 always latest
Some checks failed
Build / Build Image (push) Failing after 46s
2023-06-21 18:48:17 +02:00
f4d0073b3b add registery
Some checks failed
Build / Build Image (push) Failing after 9s
2023-06-21 18:44:02 +02:00
50ef2a7b9e Without metadata
Some checks failed
Build / Build Image (push) Failing after 21s
2023-06-21 18:42:35 +02:00
64becee114 Merge branch 'main' of ssh://gitea.marijndoeve.nl:222/Portainer-Stacks/OMB-Season-3
All checks were successful
Build / Build Image (push) Successful in 55s
2023-06-21 18:39:32 +02:00
0f1f1f3388 Actions master -> main 2023-06-21 18:39:21 +02:00
49570baa5a Update 'docker/web/Containerfile' 2023-06-19 22:49:14 +02:00
dcf12e9530 Remove phosphor 2023-06-19 21:41:54 +02:00
ac0b565477 Update 'compose.yaml' 2023-06-19 19:57:38 +02:00
35b89aca72 Upgrade to 1.19.4 2023-04-23 15:31:53 +02:00
2e80adab15 Merge pull request 'Web Container build' (#1) from test-ci into main
Reviewed-on: Portainer-Stacks/OMB-Season-3#1
2023-04-09 17:19:22 +02:00
3 changed files with 22 additions and 24 deletions

View File

@@ -1,21 +1,22 @@
name: Build and Deploy
name: Build
on:
push:
branches: ["master"]
branches: ["main"]
# Publish semver tags as releases.
tags: ["v*.*.*"]
pull_request:
branches: ["master"]
branches: ["main"]
schedule:
- cron: "0 1 * * *"
workflow_dispatch:
env:
# # Use docker.io for Docker Hub if empty
# REGISTRY: ghcr.io
REGISTRY: gitea.marijndoeve.nl
# github.repository as <account>/<repo>
IMAGE_NAME: ${{ github.repository }}
IMAGE_NAME: ${{ gitea.repository }}
GITHUB_TOKEB: ""
jobs:
build:
@@ -29,38 +30,35 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3
# Workaround: https://github.com/docker/build-push-action/issues/461
# Workaround: https://gitea.com/docker/build-push-action/issues/461
- name: Setup Docker buildx
uses: docker/setup-buildx-action@v2
# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
if: gitea.event_name != 'pull_request'
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
username: ${{ gitea.actor }}
password: ${{ secrets.GITEA_TOKEN }}
# Extract metadata (tags, labels) for Docker
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@v4
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
# - name: Extract Docker metadata
# id: meta
# uses: docker/metadata-action@v4
# with:
# images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v2
with:
context: .
file: docker/web/Containerfile
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
push: ${{ gitea.event_name != 'pull_request' }}
tags: latest

View File

@@ -72,12 +72,12 @@ services:
ports:
- "24454:24454/udp" # Voice mod
environment:
MODRINTH_PROJECTS: "fabric-api,lithium,phosphor,view-distance-fix,shulkerboxtooltip,simple-voice-chat,audioplayer"
MODRINTH_PROJECTS: "fabric-api,lithium,view-distance-fix,shulkerboxtooltip,simple-voice-chat,audioplayer"
MODRINTH_DOWNLOAD_OPTIONAL_DEPENDENCIES: "FALSE"
# Server
EULA: "TRUE"
TYPE: FABRIC
VERSION: 1.19.3
VERSION: 1.20.1
INIT_MEMORY: 1G
MAX_MEMORY: 12G
TZ: Europe/Amsterdam
@@ -93,7 +93,7 @@ services:
SEED: 7644964991330705000
SPAWN_PROTECTION: 0
MAX_TICK_TIME: -1
MOTD: "One Minecraft Boys 3: Harmitcraft"
MOTD: "One Minecraft Boys 3: Harmitcraft (1.20!)"
restart: unless-stopped
volumes:
- /opt/omb3/data:/data

View File

@@ -2,4 +2,4 @@ FROM php:8.2-apache
RUN apt-get update \
&& apt-get install -y libpq-dev \
&& docker-php-ext-install pdo_psql
&& docker-php-ext-install pdo_pgsql