Browse Source

Merge pull request #223 from kacf/2.1.x

Upgrade to Mender 2.3.0 and mender-artifact 3.4.0.
2.1.x 2.1.0
Kristian Amlie 4 years ago
committed by GitHub
parent
commit
8cf7d5d86d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      .gitlab-ci.yml
  2. 2
      Dockerfile
  3. 2
      configs/mender_convert_config

7
.gitlab-ci.yml

@ -5,8 +5,8 @@ variables:
S3_BUCKET_NAME: mender-convert-images S3_BUCKET_NAME: mender-convert-images
# These variables are present elsewhere in the repository too. Make sure to # These variables are present elsewhere in the repository too. Make sure to
# search for and change them too. # search for and change them too.
MENDER_ARTIFACT_VERSION: 3.4.0b1 MENDER_ARTIFACT_VERSION: 3.4.0
MENDER_CLIENT_VERSION: 2.3.0b1 MENDER_CLIENT_VERSION: 2.3.0
# Make sure to update the link in mender-docs to the new one when changing # Make sure to update the link in mender-docs to the new one when changing
# this. # this.
RASPBIAN_URL: http://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2020-05-28/2020-05-27-raspios-buster-lite-armhf.zip RASPBIAN_URL: http://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2020-05-28/2020-05-27-raspios-buster-lite-armhf.zip
@ -207,6 +207,3 @@ publish:s3:
- aws s3api put-object-acl --acl public-read --bucket $S3_BUCKET_NAME - aws s3api put-object-acl --acl public-read --bucket $S3_BUCKET_NAME
--key ${RASPBIAN_NAME}/arm/${PUBLISH_NAME} --key ${RASPBIAN_NAME}/arm/${PUBLISH_NAME}
- done - done
only:
- /^(master|[0-9]+\.[0-9]+\.x)$/

2
Dockerfile

@ -11,7 +11,7 @@ RUN cd /root/pxz && make
FROM ubuntu:20.04 FROM ubuntu:20.04
ARG MENDER_ARTIFACT_VERSION=3.4.0b1 ARG MENDER_ARTIFACT_VERSION=3.4.0
RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install -y \ RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install -y \
# For 'ar' command to unpack .deb # For 'ar' command to unpack .deb

2
configs/mender_convert_config

@ -98,7 +98,7 @@ MENDER_PARTITION_ALIGNMENT="8388608"
# Mender client version # Mender client version
# #
# This is used to fetch the correct binaries # This is used to fetch the correct binaries
MENDER_CLIENT_VERSION="2.3.0b1" MENDER_CLIENT_VERSION="2.3.0"
# File storage, containing binary files, do not modify this unless you know # File storage, containing binary files, do not modify this unless you know
# what you are doing. # what you are doing.

Loading…
Cancel
Save