Skip to content

Commit 7704d85

Browse files
committed
upload_package: revisit it to use rclone
Signed-off-by: Mathieu Tortuyaux <[email protected]>
1 parent cceaa4b commit 7704d85

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

upload_package

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
set -e
44
shopt -s expand_aliases
55

6-
if [ $# -ne 4 ] && [ $# -ne 5 ]; then
7-
echo "usage: ${0} DATA_DIR NEBRASKA_URL ORIGIN_SSH_URL VERSION"
6+
if [ $# -ne 3 ] && [ $# -ne 4 ]; then
7+
echo "usage: ${0} DATA_DIR NEBRASKA_URL VERSION"
88
exit 1
99
fi
1010

@@ -16,8 +16,8 @@ fi
1616

1717
DATA_DIR="$1"
1818
NEBRASKA_URL="$2"
19-
ORIGIN_SSH_URL="$3"
20-
VERSION="$4"
19+
VERSION="$3"
20+
RCLONE_CONFIGURATION_FILE="${4:-${HOME}/.config/rclone/rclone.conf}"
2121

2222
# Used for debugging/testing of the staging server:
2323
NOUPLOAD="${NOUPLOAD-}"
@@ -71,13 +71,18 @@ shopt -u nullglob
7171

7272
echo "Copying update payload to update server"
7373

74-
SERVER_UPDATE_DIR="/var/www/origin.release.flatcar-linux.net/update/${ARCH}/${VERSION}/"
75-
if [ "${NOUPLOAD}" = "" ]; then
76-
ssh "core@${ORIGIN_SSH_URL}" mkdir -p "${SERVER_UPDATE_DIR}"
77-
scp "${UPDATE_PATH}" "${UPDATE_CHECKSUM_PATH}" "${EXTRA_FILES[@]}" "${EXTRA_SUMS[@]}" "core@${ORIGIN_SSH_URL}:${SERVER_UPDATE_DIR}"
78-
else
79-
echo "NOUPLOAD set, skipping upload to origin server"
80-
fi
74+
docker run --rm \
75+
--volume "${DATA_DIR}:/opt/data:ro" \
76+
--volume "${RCLONE_CONFIGURATION_FILE}:/opt/rclone.conf:ro" \
77+
docker.io/rclone/rclone:1.71.1 \
78+
--config "/opt/rclone.conf" \
79+
sync \
80+
${NOUPLOAD:+--dry-run} \
81+
--dry-run \
82+
--progress \
83+
--include "*.{gz,sha256}" \
84+
"/opt/data/" \
85+
"r2:flatcar/update/${ARCH}/${VERSION}/"
8186

8287
# Nebraska's arch enum values:
8388
# https://github.com/kinvolk/nebraska/blob/953a1e672f42dea4530161a31756db239e0bb8aa/pkg/api/arch.go#L9

0 commit comments

Comments
 (0)