chaos/drone-runner-podman
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix incorrect arch in amd64 image

Browse Source
This commit is contained in:
Brad Rydzewski
2019-10-31 11:40:20 -07:00
parent d6505a1717
commit bcaf3a536c
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
command/daemon/config.go
View File

@@ -104,6 +104,7 @@ type Config struct {
// legacy environment variables. the key is the legacy // legacy environment variables. the key is the legacy
// variable name, and the value is the new variable name. // variable name, and the value is the new variable name.
var legacy = map[string]string{ var legacy = map[string]string{
"DRONE_MACHINE": "DRONE_RUNNER_NAME",
// registry settings // registry settings
"DRONE_REGISTRY_ENDPOINT": "DRONE_REGISTRY_PLUGIN_ENDPOINT", "DRONE_REGISTRY_ENDPOINT": "DRONE_REGISTRY_PLUGIN_ENDPOINT",
"DRONE_REGISTRY_SECRET": "DRONE_REGISTRY_PLUGIN_SECRET", "DRONE_REGISTRY_SECRET": "DRONE_REGISTRY_PLUGIN_SECRET",

6
docker/Dockerfile.linux.amd64
View File

@@ -6,9 +6,11 @@ EXPOSE 3000
ENV GODEBUG netdns=go ENV GODEBUG netdns=go
ENV DRONE_PLATFORM_OS linux ENV DRONE_PLATFORM_OS linux
ENV DRONE_PLATFORM_ARCH arm64 ENV DRONE_PLATFORM_ARCH amd64
COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
ADD release/linux/arm64/drone-runner-docker /bin/ LABEL com.centurylinklabs.watchtower.stop-signal="SIGINT"
ADD release/linux/amd64/drone-runner-docker /bin/
ENTRYPOINT ["/bin/drone-runner-docker"] ENTRYPOINT ["/bin/drone-runner-docker"]

2
docker/Dockerfile.linux.arm
View File

@@ -10,5 +10,7 @@ ENV DRONE_PLATFORM_ARCH arm
COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
LABEL com.centurylinklabs.watchtower.stop-signal="SIGINT"
ADD release/linux/arm/drone-runner-docker /bin/ ADD release/linux/arm/drone-runner-docker /bin/
ENTRYPOINT ["/bin/drone-runner-docker"] ENTRYPOINT ["/bin/drone-runner-docker"]

2
docker/Dockerfile.linux.arm64
View File

@@ -10,5 +10,7 @@ ENV DRONE_PLATFORM_ARCH arm64
COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
LABEL com.centurylinklabs.watchtower.stop-signal="SIGINT"
ADD release/linux/arm64/drone-runner-docker /bin/ ADD release/linux/arm64/drone-runner-docker /bin/
ENTRYPOINT ["/bin/drone-runner-docker"] ENTRYPOINT ["/bin/drone-runner-docker"]