Skip to content

Commit

Permalink
Merge pull request #28 from linuxserver/repo-move
Browse files Browse the repository at this point in the history
  • Loading branch information
thespad committed Aug 12, 2024
2 parents 3e68060 + 741359b commit 66ac3c4
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/external_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_SNAPDROP_MASTER\". ****"
echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_SNAPDROP_MASTER\`" >> $GITHUB_STEP_SUMMARY
echo "**** Retrieving external version ****"
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://github.com/gitapi/repos/RobinLinus/snapdrop/commits/master" | jq -r '. | .sha' | cut -c1-8)
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://github.com/gitapi/repos/snapdrop/snapdrop/commits/master" | jq -r '. | .sha' | cut -c1-8)
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
echo "**** Can't retrieve external version, exiting ****"
FAILURE_REASON="Can't retrieve external version for snapdrop branch master"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ RUN \
echo "**** install snapdrop ****" && \
mkdir -p /app/www && \
if [ -z ${SNAPDROP_RELEASE} ]; then \
SNAPDROP_RELEASE=$(curl -sX GET "https://github.com/gitapi/repos/RobinLinus/snapdrop/commits/master" \
SNAPDROP_RELEASE=$(curl -sX GET "https://github.com/gitapi/repos/snapdrop/snapdrop/commits/master" \
| awk '/sha/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/snapdrop.tar.gz -L \
"https://github.com/RobinLinus/snapdrop/archive/${SNAPDROP_RELEASE}.tar.gz" && \
"https://github.com/snapdrop/snapdrop/archive/${SNAPDROP_RELEASE}.tar.gz" && \
tar xf \
/tmp/snapdrop.tar.gz -C \
/app/www/ --strip-components=1 && \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ RUN \
echo "**** install snapdrop ****" && \
mkdir -p /app/www && \
if [ -z ${SNAPDROP_RELEASE} ]; then \
SNAPDROP_RELEASE=$(curl -sX GET "https://github.com/gitapi/repos/RobinLinus/snapdrop/commits/master" \
SNAPDROP_RELEASE=$(curl -sX GET "https://github.com/gitapi/repos/snapdrop/snapdrop/commits/master" \
| awk '/sha/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/snapdrop.tar.gz -L \
"https://github.com/RobinLinus/snapdrop/archive/${SNAPDROP_RELEASE}.tar.gz" && \
"https://github.com/snapdrop/snapdrop/archive/${SNAPDROP_RELEASE}.tar.gz" && \
tar xf \
/tmp/snapdrop.tar.gz -C \
/app/www/ --strip-components=1 && \
Expand Down
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pipeline {
GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
EXT_GIT_BRANCH = 'master'
EXT_USER = 'RobinLinus'
EXT_USER = 'snapdrop'
EXT_REPO = 'snapdrop'
BUILD_VERSION_ARG = 'SNAPDROP_VERSION'
LS_USER = 'linuxserver'
Expand Down Expand Up @@ -533,7 +533,7 @@ pipeline {
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
--label \"org.opencontainers.image.title=Snapdrop\" \
--label \"org.opencontainers.image.description=[Snapdrop](https://github.com/RobinLinus/snapdrop) A local file sharing in your browser. Inspired by Apple's Airdrop.\" \
--label \"org.opencontainers.image.description=[Snapdrop](https://github.com/snapdrop/snapdrop) A local file sharing in your browser. Inspired by Apple's Airdrop.\" \
--no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
--provenance=false --sbom=false \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
Expand Down Expand Up @@ -565,7 +565,7 @@ pipeline {
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
--label \"org.opencontainers.image.title=Snapdrop\" \
--label \"org.opencontainers.image.description=[Snapdrop](https://github.com/RobinLinus/snapdrop) A local file sharing in your browser. Inspired by Apple's Airdrop.\" \
--label \"org.opencontainers.image.description=[Snapdrop](https://github.com/snapdrop/snapdrop) A local file sharing in your browser. Inspired by Apple's Airdrop.\" \
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
--provenance=false --sbom=false \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
Expand Down Expand Up @@ -594,7 +594,7 @@ pipeline {
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
--label \"org.opencontainers.image.title=Snapdrop\" \
--label \"org.opencontainers.image.description=[Snapdrop](https://github.com/RobinLinus/snapdrop) A local file sharing in your browser. Inspired by Apple's Airdrop.\" \
--label \"org.opencontainers.image.description=[Snapdrop](https://github.com/snapdrop/snapdrop) A local file sharing in your browser. Inspired by Apple's Airdrop.\" \
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
--provenance=false --sbom=false \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ Find us at:
[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-snapdrop%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-snapdrop/job/master/)
[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fsnapdrop%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/snapdrop/latest/index.html)

[Snapdrop](https://github.com/RobinLinus/snapdrop) A local file sharing in your browser. Inspired by Apple's Airdrop.
[Snapdrop](https://github.com/snapdrop/snapdrop) A local file sharing in your browser. Inspired by Apple's Airdrop.

[![snapdrop](https://github.com/raw/RobinLinus/snapdrop/master/client/images/logo_transparent_512x512.png)](https://github.com/RobinLinus/snapdrop)
[![snapdrop](https://github.com/raw/snapdrop/snapdrop/master/client/images/logo_transparent_512x512.png)](https://github.com/snapdrop/snapdrop)

## Supported Architectures

Expand Down
2 changes: 1 addition & 1 deletion jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ release_tag: latest
ls_branch: master
repo_vars:
- EXT_GIT_BRANCH = 'master'
- EXT_USER = 'RobinLinus'
- EXT_USER = 'snapdrop'
- EXT_REPO = 'snapdrop'
- BUILD_VERSION_ARG = 'SNAPDROP_VERSION'
- LS_USER = 'linuxserver'
Expand Down
4 changes: 2 additions & 2 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

# project information
project_name: snapdrop
project_url: "https://github.com/RobinLinus/snapdrop"
project_logo: "https://github.com/raw/RobinLinus/snapdrop/master/client/images/logo_transparent_512x512.png"
project_url: "https://github.com/snapdrop/snapdrop"
project_logo: "https://github.com/raw/snapdrop/snapdrop/master/client/images/logo_transparent_512x512.png"
project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) A local file sharing in your browser. Inspired by Apple's Airdrop."
project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"

Expand Down
Empty file modified root/migrations/02-default-location
100644 → 100755
Empty file.

0 comments on commit 66ac3c4

Please sign in to comment.