Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed docker builds for arm64 and updated docker documentation #2899

Open
wants to merge 6 commits into
base: general-devel
Choose a base branch
from
Open

Fixed docker builds for arm64 and updated docker documentation #2899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
72f0dc3
Included missing directories in dockerignore file
yeraylopez Jan 15, 2023
d8c8b0c
Updated changelog
yeraylopez Jan 15, 2023
97f6983
Fixed build command for arm64
yeraylopez Jan 15, 2023
6f0fe94
Updated error message for unsupported platforms
yeraylopez Jan 16, 2023
f696551
dockerignore file updated to include entire TShock directory
yeraylopez Jan 16, 2023
de0d5d7
Removed unnecessary use of platform flag
yeraylopez Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
# ignore every file
*
# Exclude git
.git/

# except for the ones required for building
!i18n/
!prebuilts/
!TerrariaServerAPI/
!TShockAPI/
!TShockLauncher/
!TShockLauncher.Tests/
!TShock.sln

# but exclude build artifacts
# Exclude build artifacts
*/bin/
*/obj/
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN \
;; \
"windows/amd64") export ARCH="win-x64" \
;; \
*) echo "Error: Unsupported platform ${TARGETPLATFORM}" && exit 1 \
*) echo "Error: Unsupported platform ${TARGETPLATFORM} (supported: linux/amd64, linux/arm64, linux/arm/v7, windows/amd64)" && exit 1 \
;; \
esac && \
dotnet publish -o output/ -r "${ARCH}" -v m -f net6.0 -c Release -p:PublishSingleFile=true --self-contained false
Expand Down
1 change: 1 addition & 0 deletions docs/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ Use past tense when adding new entries; sign your name off when you add or chang
* Initialized achievements and the `AchievementManager` on the server. This ensures that players cannot cause exceptions to be thrown, chat messages are always logged, and allows achievement names to be localized in the console. Also added a test case for this. (@drunderscore)
* Allowed multiple test cases to be in TShock's test suite. (@drunderscore)
* Fixed unable to use Purification/Evil Powder in jungle. (@sgkoishi)
* Fixed Docker builds not working. Ensures future updates do not break docker builds. (@PotatoCider, @yeraylopez)

## TShock 5.1.3
* Added support for Terraria 1.4.4.9 via OTAPI 3.1.20. (@SignatureBeef)
Expand Down
2 changes: 1 addition & 1 deletion docs/docker.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Using `docker buildx`, you could build [multi-platform images](https://docs.dock
For Example:
```bash
# Building the image using buildx and loading it into docker
sudo docker buildx build -t tshock:linux-arm64 --platform linux/arm64 --load .
sudo docker buildx build -t tshock:linux-arm64 --build-arg TARGETPLATFORM=linux/arm64 --load .
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
sudo docker buildx build -t tshock:linux-arm64 --build-arg TARGETPLATFORM=linux/arm64 --load .
sudo docker buildx build -t tshock:linux-arm64 --platform linux/arm64 --load .


# Running the image
docker run -p 7777:7777 -p 7878:7878 \
Expand Down