Skip to content

Commit

Permalink
Merge pull request #18 from Cyberbeni/podman-support
Browse files Browse the repository at this point in the history
Use fully qualified container names everywhere for better podman support
  • Loading branch information
Cyberbeni authored Feb 8, 2025
2 parents bbd6c1a + cbc0bea commit d5faa4d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM --platform=$BUILDPLATFORM swift:6.0.2 AS build
FROM --platform=$BUILDPLATFORM docker.io/swift:6.0.2 AS build
WORKDIR /workspace
RUN swift sdk install \
https://download.swift.org/swift-6.0.2-release/static-sdk/swift-6.0.2-RELEASE/swift-6.0.2-RELEASE_static-linux-0.0.1.artifactbundle.tar.gz \
Expand All @@ -22,7 +22,7 @@ RUN --mount=type=cache,target=/workspace/.build,id=build-$TARGETPLATFORM \
mkdir -p dist && \
cp .build/release/Wiring dist

FROM alpine:latest AS release
FROM docker.io/alpine:latest AS release
# https://pkgs.alpinelinux.org/contents
# ping: iputils-ping
# arp: net-tools
Expand Down
6 changes: 3 additions & 3 deletions Package.resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"originHash" : "9fd94c5804630e5cfda182e14bfc1b35f7b2c2136b331e87b9286a9dc60c97cd",
"originHash" : "1efbffed17285e38bc85f0be0122f0d1ff6224f0a32a784f24e463338952135e",
"pins" : [
{
"identity" : "mqtt-nio",
Expand Down Expand Up @@ -78,8 +78,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/nicklockwood/SwiftFormat",
"state" : {
"revision" : "86ed20990585f478c0daf309af645c2a528b59d8",
"version" : "0.54.6"
"revision" : "468a7d32dedc8d352c191594b3b45d9fd8ba291b",
"version" : "0.55.5"
}
}
],
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let package = Package(
.package(url: "https://github.com/swift-server-community/mqtt-nio", from: "2.11.0"),
.package(url: "https://github.com/apple/swift-nio", from: "2.76.1"),
// Plugins:
.package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.54.6"),
.package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.55.5"),
],
targets: [
.executableTarget(
Expand Down
2 changes: 1 addition & 1 deletion scripts/format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ elif which docker > /dev/null 2>&1; then
docker run --rm \
--volume .:/workspace \
--user "$(id -u):$(id -g)" \
swift:6.0.2 \
docker.io/swift:6.0.2 \
/workspace/scripts/format.sh
elif which podman > /dev/null 2>&1; then
podman run --rm \
Expand Down

0 comments on commit d5faa4d

Please sign in to comment.