mirror of
https://github.com/factoriotools/factorio-docker.git
synced 2025-07-11 19:45:22 +02:00
Compare commits
7 Commits
2ba59b4f95
...
fk_fixedup
Author | SHA1 | Date | |
---|---|---|---|
da49c13bb7 | |||
a8ecb01f4c | |||
6692bb514d | |||
2d805feb4f | |||
bc2dc44cad | |||
04085ef23d | |||
fbb787e535 |
14
.github/dependabot.yml
vendored
14
.github/dependabot.yml
vendored
@ -1,7 +1,11 @@
|
|||||||
version: 2
|
version: 2
|
||||||
updates:
|
updates:
|
||||||
- package-ecosystem: docker
|
- package-ecosystem: "github-actions"
|
||||||
directory: "/docker"
|
directory: "/"
|
||||||
schedule:
|
schedule:
|
||||||
interval: daily
|
interval: "daily"
|
||||||
open-pull-requests-limit: 10
|
|
||||||
|
- package-ecosystem: docker
|
||||||
|
directory: "/docker"
|
||||||
|
schedule:
|
||||||
|
interval: "daily"
|
||||||
|
@ -4,19 +4,25 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
|
tags:
|
||||||
|
- latest
|
||||||
|
pull_request:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v3
|
||||||
|
|
||||||
- name: build and push
|
- name: build and push
|
||||||
if: ${{ env.DOCKER_USERNAME != '' && env.DOCKER_PASSWORD != '' }}
|
if: ${{ env.DOCKER_USERNAME != '' && env.DOCKER_PASSWORD != '' }}
|
||||||
env:
|
env:
|
||||||
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||||
run: |
|
run: |
|
||||||
./build.py --push-tags --multiarch
|
./build.py --push-tags --multiarch
|
5
.github/workflows/docker-description.yml
vendored
5
.github/workflows/docker-description.yml
vendored
@ -10,9 +10,10 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Docker Hub Description
|
- name: Docker Hub Description
|
||||||
uses: peter-evans/dockerhub-description@v2.4.1
|
uses: peter-evans/dockerhub-description@v4.0.0
|
||||||
if: ${{ env.DOCKER_USERNAME != '' && env.DOCKER_PASSWORD != '' }}
|
if: ${{ env.DOCKER_USERNAME != '' && env.DOCKER_PASSWORD != '' }}
|
||||||
env:
|
env:
|
||||||
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
22
.github/workflows/docker.yml
vendored
22
.github/workflows/docker.yml
vendored
@ -1,22 +0,0 @@
|
|||||||
name: Docker build
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- latest
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v2
|
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v3
|
|
||||||
- name: build
|
|
||||||
env:
|
|
||||||
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
|
||||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
|
||||||
run: |
|
|
||||||
./build.py --multiarch
|
|
8
.github/workflows/lint.yml
vendored
8
.github/workflows/lint.yml
vendored
@ -10,7 +10,9 @@ jobs:
|
|||||||
shellcheck:
|
shellcheck:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: shellcheck
|
- name: shellcheck
|
||||||
uses: reviewdog/action-shellcheck@v1
|
uses: reviewdog/action-shellcheck@v1
|
||||||
with:
|
with:
|
||||||
@ -20,7 +22,9 @@ jobs:
|
|||||||
hadolint:
|
hadolint:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: hadolint
|
- name: hadolint
|
||||||
uses: reviewdog/action-hadolint@v1
|
uses: reviewdog/action-hadolint@v1
|
||||||
with:
|
with:
|
||||||
|
11
.github/workflows/update.yml
vendored
11
.github/workflows/update.yml
vendored
@ -4,20 +4,15 @@ on:
|
|||||||
schedule:
|
schedule:
|
||||||
- cron: "0 * * * *"
|
- cron: "0 * * * *"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
|
||||||
desc:
|
|
||||||
description: "desc"
|
|
||||||
required: false
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
check:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository == 'factoriotools/factorio-docker')
|
if: github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository == 'factoriotools/factorio-docker')
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- name: Checkout
|
||||||
with:
|
uses: actions/checkout@v4
|
||||||
token: ${{ secrets.REPO_TOKEN }}
|
|
||||||
|
|
||||||
- name: Run update script
|
- name: Run update script
|
||||||
run: ./update.sh
|
run: ./update.sh
|
||||||
|
@ -6,7 +6,8 @@
|
|||||||
[中文](./README_zh_CN.md)
|
[中文](./README_zh_CN.md)
|
||||||
|
|
||||||
<!-- start autogeneration tags -->
|
<!-- start autogeneration tags -->
|
||||||
* `2`, `2.0`, `2.0.7`, `latest`, `stable`, `stable-2.0.7`
|
* `2`, `2.0`, `2.0.8`, `latest`, `stable`, `stable-2.0.8`
|
||||||
|
* `2`, `2.0`, `2.0.7`, `stable`, `stable-2.0.7`
|
||||||
* `1`, `1.1`, `1.1.110`, `stable-1.1.110`
|
* `1`, `1.1`, `1.1.110`, `stable-1.1.110`
|
||||||
* `1.0`, `1.0.0`
|
* `1.0`, `1.0.0`
|
||||||
* `0.17`, `0.17.79`
|
* `0.17`, `0.17.79`
|
||||||
|
@ -57,15 +57,15 @@
|
|||||||
"1.1.110"
|
"1.1.110"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"2.0.7": {
|
"2.0.8": {
|
||||||
"sha256": "e6a64a9ee5b1d3773cd1f40aa5cf78e91960eade6c508fd365c34752afdf2762",
|
"sha256": "d9594c4d552a3e4f965b188a4774da8c8b010fc23ddb0efc63b1d94818dde1ca",
|
||||||
"tags": [
|
"tags": [
|
||||||
"latest",
|
"latest",
|
||||||
"stable",
|
"stable",
|
||||||
"stable-2.0.7",
|
"stable-2.0.8",
|
||||||
"2",
|
"2",
|
||||||
"2.0",
|
"2.0",
|
||||||
"2.0.7"
|
"2.0.8"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,8 +6,8 @@ services:
|
|||||||
args:
|
args:
|
||||||
# Check buildinfo.json for supported versions and SHAs
|
# Check buildinfo.json for supported versions and SHAs
|
||||||
# https://github.com/factoriotools/factorio-docker/blob/master/buildinfo.json
|
# https://github.com/factoriotools/factorio-docker/blob/master/buildinfo.json
|
||||||
- VERSION=2.0.7
|
- VERSION=2.0.8
|
||||||
- SHA256=e6a64a9ee5b1d3773cd1f40aa5cf78e91960eade6c508fd365c34752afdf2762
|
- SHA256=d9594c4d552a3e4f965b188a4774da8c8b010fc23ddb0efc63b1d94818dde1ca
|
||||||
ports:
|
ports:
|
||||||
- "34197:34197/udp"
|
- "34197:34197/udp"
|
||||||
- "27015:27015/tcp"
|
- "27015:27015/tcp"
|
||||||
|
13
update.sh
13
update.sh
@ -4,12 +4,16 @@ SEMVER_REGEX="^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$"
|
|||||||
|
|
||||||
stable_online_version=$(curl 'https://factorio.com/api/latest-releases' | jq '.stable.headless' -r)
|
stable_online_version=$(curl 'https://factorio.com/api/latest-releases' | jq '.stable.headless' -r)
|
||||||
experimental_online_version=$(curl 'https://factorio.com/api/latest-releases' | jq '.experimental.headless' -r)
|
experimental_online_version=$(curl 'https://factorio.com/api/latest-releases' | jq '.experimental.headless' -r)
|
||||||
|
|
||||||
stable_sha256=$(curl "https://factorio.com/download/sha256sums/" | grep -E "(factorio_headless_x64_|factorio-headless_linux_)${stable_online_version}.tar.xz" | awk '{print $1}')
|
stable_sha256=$(curl "https://factorio.com/download/sha256sums/" | grep -E "(factorio_headless_x64_|factorio-headless_linux_)${stable_online_version}.tar.xz" | awk '{print $1}')
|
||||||
experimental_sha256=$(curl "https://factorio.com/download/sha256sums/" | grep -E "(factorio_headless_x64_|factorio-headless_linux_)${experimental_online_version}.tar.xz" | awk '{print $1}')
|
experimental_sha256=$(curl "https://factorio.com/download/sha256sums/" | grep -E "(factorio_headless_x64_|factorio-headless_linux_)${experimental_online_version}.tar.xz" | awk '{print $1}')
|
||||||
stable_current_version=$(jq 'with_entries(select(contains({value:{tags:["stable"]}}))) | keys | .[0]' buildinfo.json -r)
|
|
||||||
latest_current_version=$(jq 'with_entries(select(contains({value:{tags:["latest"]}}))) | keys | .[0]' buildinfo.json -r)
|
stable_current_version=$(jq 'with_entries(select(.value.tags | index("stable"))) | keys | .[0]' buildinfo.json -r)
|
||||||
|
latest_current_version=$(jq 'with_entries(select(.value.tags | index("latest"))) | keys | .[0]' buildinfo.json -r)
|
||||||
|
|
||||||
echo "stable_online_version=${stable_online_version} experimental_online_version=${experimental_online_version}"
|
echo "stable_online_version=${stable_online_version} experimental_online_version=${experimental_online_version}"
|
||||||
echo "stable_current_version=${stable_current_version} latest_current_version=${latest_current_version}"
|
echo "stable_current_version=${stable_current_version} latest_current_version=${latest_current_version}"
|
||||||
|
|
||||||
if [[ -z "${stable_online_version}" ]] || [[ -z "${experimental_online_version}" ]]; then
|
if [[ -z "${stable_online_version}" ]] || [[ -z "${experimental_online_version}" ]]; then
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
@ -57,6 +61,11 @@ echo "stableCurrentVersionShort=${stableCurrentVersionShort} latestCurrentVersio
|
|||||||
|
|
||||||
tmpfile=$(mktemp)
|
tmpfile=$(mktemp)
|
||||||
|
|
||||||
|
# Remove stable tag
|
||||||
|
cp buildinfo.json "$tmpfile"
|
||||||
|
jq --arg stable_current_version "$stable_current_version" 'with_entries(if .key == $stable_current_version then .value.tags |= . - ["stable"] else . end)' "$tmpfile" > buildinfo.json
|
||||||
|
rm -f -- "$tmpfile"
|
||||||
|
|
||||||
# Remove latest tag
|
# Remove latest tag
|
||||||
cp buildinfo.json "$tmpfile"
|
cp buildinfo.json "$tmpfile"
|
||||||
jq --arg latest_current_version "$latest_current_version" 'with_entries(if .key == $latest_current_version then .value.tags |= . - ["latest"] else . end)' "$tmpfile" > buildinfo.json
|
jq --arg latest_current_version "$latest_current_version" 'with_entries(if .key == $latest_current_version then .value.tags |= . - ["latest"] else . end)' "$tmpfile" > buildinfo.json
|
||||||
|
Reference in New Issue
Block a user