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

[DEPRECATE] Remove OSX (darwin) based binaries #967

Merged
merged 1 commit into from
May 3, 2020
Merged

[DEPRECATE] Remove OSX (darwin) based binaries #967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions .buildkite/annotations/artifacts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@
<a href="artifact://authelia-linux-arm64v8.tar.gz.sha256">authelia-linux-arm64v8.tar.gz.sha256</a>
</dd>
</div>
<div class="m1">
<dt>darwin</dt>
<dd>
<a href="artifact://authelia-darwin-amd64.tar.gz">authelia-darwin-amd64.tar.gz</a><br>
<a href="artifact://authelia-darwin-amd64.tar.gz.sha256">authelia-darwin-amd64.tar.gz.sha256</a>
</dd>
</div>
<div class="m1">
<dt>public_html</dt>
<dd>
Expand Down
1 change: 0 additions & 1 deletion .buildkite/deployment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ steps:
- label: ":github: Deploy Artifacts"
command: "ghartifacts.sh"
depends_on:
- "build-docker-darwin-amd64"
- "build-docker-linux-amd64"
- "build-docker-linux-arm32v7"
- "build-docker-linux-arm64v8"
Expand Down
12 changes: 3 additions & 9 deletions .buildkite/hooks/pre-artifact
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,8 @@ if [[ $BUILDKITE_LABEL =~ ":docker: Build Image" ]]; then
docker create --name authelia-binary ${DOCKER_IMAGE}:latest
docker cp authelia-binary:/usr/app/authelia ./authelia-"${OS}"-"${ARCH}"
docker rm -f authelia-binary
if [[ $OS == "linux" ]]; then
tar -czf authelia-"${OS}"-"${ARCH}".tar.gz authelia-"${OS}"-"${ARCH}" authelia.service config.template.yml
else
tar -czf authelia-"${OS}"-"${ARCH}".tar.gz authelia-"${OS}"-"${ARCH}" config.template.yml
fi
tar -czf authelia-"${OS}"-"${ARCH}".tar.gz authelia-"${OS}"-"${ARCH}" authelia.service config.template.yml
sha256sum authelia-"${OS}"-"${ARCH}".tar.gz > authelia-"${OS}"-"${ARCH}".tar.gz.sha256
# Saving image for push to docker hub, darwin image is not required as OSX utilses linux manifests
if [[ $BUILDKITE_LABEL != ":docker: Build Image [darwin]" ]]; then
docker save ${DOCKER_IMAGE} | zstdmt -T0 -12 > authelia-image-"${ARCH}".tar.zst
fi
# Saving image for push to docker hub
docker save ${DOCKER_IMAGE} | zstdmt -T0 -12 > authelia-image-"${ARCH}".tar.zst
fi
0 .buildkite/upstream.yml → .buildkite/pipeline.yml
View file
Open in desktop
File renamed without changes.
17 changes: 1 addition & 16 deletions .buildkite/steps/buildimages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,17 @@
#!/bin/bash
set -eu

declare -A BUILDS=(["linux"]="amd64 arm32v7 arm64v8" ["darwin"]="amd64")
declare -A BUILDS=(["linux"]="amd64 arm32v7 arm64v8")

for BUILD_OS in "${!BUILDS[@]}"; do
for BUILD_ARCH in ${BUILDS[$BUILD_OS]}; do
if [[ "${BUILD_OS}" == "darwin" ]]; then
cat << EOF
- label: ":docker: Build Image [${BUILD_OS}]"
command: "authelia-scripts docker build --arch=${BUILD_OS}"
EOF
else
cat << EOF
- label: ":docker: Build Image [${BUILD_ARCH}]"
command: "authelia-scripts docker build --arch=${BUILD_ARCH}"
EOF
fi
cat << EOF
agents:
build: "${BUILD_OS}-${BUILD_ARCH}"
artifact_paths:
EOF
if [[ "${BUILD_OS}" == "linux" ]]; then
cat << EOF
- "authelia-image-${BUILD_ARCH}.tar.zst"
EOF
fi
cat << EOF
- "authelia-${BUILD_OS}-${BUILD_ARCH}.tar.gz"
- "authelia-${BUILD_OS}-${BUILD_ARCH}.tar.gz.sha256"
env:
Expand Down
1 change: 0 additions & 1 deletion .buildkite/steps/ghartifacts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ for FILES in \
authelia-linux-amd64.tar.gz authelia-linux-amd64.tar.gz.sha256 \
authelia-linux-arm32v7.tar.gz authelia-linux-arm32v7.tar.gz.sha256 \
authelia-linux-arm64v8.tar.gz authelia-linux-arm64v8.tar.gz.sha256 \
authelia-darwin-amd64.tar.gz authelia-darwin-amd64.tar.gz.sha256 \
authelia-public_html.tar.gz authelia-public_html.tar.gz.sha256;
do
artifacts+=(-a "${FILES}")
Expand Down