Compare commits

..

No commits in common. "68b56e7c25e2a7185ea3233fba333a7bf7580195" and "7c66041a6f7d5e83a4f3a8d8570613e5b2f8d47b" have entirely different histories.

4 changed files with 15 additions and 14 deletions

View File

@ -29,7 +29,7 @@ jobs:
submodules: recursive submodules: recursive
fetch-depth: 0 fetch-depth: 0
- name: Install dependencies - name: Install dependencies
run: sudo apt install clang cmake snap libsqlite3-dev -y && sudo snap install powershell --classic run: sudo apt install clang cmake snap -y && sudo snap install powershell --classic
- name: Check compilation - name: Check compilation
run: | run: |
$versions = "104", "728", "1013" $versions = "104", "728", "1013"
@ -113,7 +113,7 @@ jobs:
copy-artifacts: copy-artifacts:
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master' if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'
runs-on: ubuntu-latest runs-on: ubuntu-22.04
needs: [windows-build, ubuntu-build] needs: [windows-build, ubuntu-build]
env: env:
BOT_SSH_KEY: ${{ secrets.BOT_SSH_KEY }} BOT_SSH_KEY: ${{ secrets.BOT_SSH_KEY }}

View File

@ -11,6 +11,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions: permissions:
contents: read contents: read
strategy:
matrix:
platforms:
- linux/amd64
- linux/arm64
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Retrieve major version - name: Retrieve major version
@ -26,13 +31,11 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build and push the Docker image - name: Build and push the Docker image
uses: docker/build-push-action@v6 uses: docker/build-push-action@v5
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile
platforms: linux/amd64,linux/arm64 platforms: ${{ matrix.platforms }}
push: true push: true
tags: ${{ secrets.DOCKERHUB_REPOSITORY }}:${{ github.ref_name }},${{ secrets.DOCKERHUB_REPOSITORY }}:${{ steps.split.outputs._0 }},${{ secrets.DOCKERHUB_REPOSITORY }}:latest tags: ${{ secrets.DOCKERHUB_REPOSITORY }}:${{ github.ref_name }},${{ secrets.DOCKERHUB_REPOSITORY }}:${{ steps.split.outputs._0 }},${{ secrets.DOCKERHUB_REPOSITORY }}:latest

View File

@ -1,5 +1,5 @@
# build # build
FROM debian:stable-slim AS build FROM debian:stable-slim as build
WORKDIR /usr/src/app WORKDIR /usr/src/app
@ -14,7 +14,7 @@ COPY vendor ./vendor
COPY .git ./.git COPY .git ./.git
COPY Makefile CMakeLists.txt version.h.in ./ COPY Makefile CMakeLists.txt version.h.in ./
RUN make nosandbox -j$(nproc) RUN make -j8
# prod # prod
FROM debian:stable-slim FROM debian:stable-slim
@ -29,8 +29,4 @@ COPY sql ./sql
CMD ["/bin/fusion"] CMD ["/bin/fusion"]
EXPOSE 23000/tcp LABEL Name=openfusion Version=0.0.2
EXPOSE 23001/tcp
EXPOSE 8001/tcp
LABEL Name=openfusion Version=1.6.0

View File

@ -1,9 +1,11 @@
version: '3.4'
services: services:
openfusion: openfusion:
image: openfusion
build: build:
context: . context: .
dockerfile: ./Dockerfile dockerfile: ./Dockerfile
image: openfusion/openfusion:latest
volumes: volumes:
- ./config.ini:/usr/src/app/config.ini - ./config.ini:/usr/src/app/config.ini
- ./database.db:/usr/src/app/database.db - ./database.db:/usr/src/app/database.db