Browse Source
Merge pull request #143 from lluiscampos/update-for-release-2.2.1
Upgrade client and mender-artifact to 2.1.2 and 3.2.1, respectively
1.2.x
1.2.2
Lluis Campos
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with
9 additions and
10 deletions
-
.gitlab-ci.yml
-
.travis.yml
-
Dockerfile
-
LIC_FILES_CHKSUM.sha256
-
device-image-shell/Dockerfile
-
docker-build
|
|
@ -20,12 +20,12 @@ test: |
|
|
- git fetch origin 'refs/heads/*:refs/heads/*' |
|
|
- git fetch origin 'refs/heads/*:refs/heads/*' |
|
|
# Get last remaining tags, if any. |
|
|
# Get last remaining tags, if any. |
|
|
- git fetch --tags origin |
|
|
- git fetch --tags origin |
|
|
- git clone http://github.com/mendersoftware/mendertesting |
|
|
- git clone http://github.com/mendersoftware/mendertesting /tmp/mendertesting |
|
|
script: |
|
|
script: |
|
|
# Check commit compliance. |
|
|
# Check commit compliance. |
|
|
- mendertesting/check_commits.sh |
|
|
- /tmp/mendertesting/check_commits.sh |
|
|
# Check licenses |
|
|
# Check licenses |
|
|
- mendertesting/check_license.sh |
|
|
- /tmp/mendertesting/check_license.sh |
|
|
|
|
|
|
|
|
build: |
|
|
build: |
|
|
stage: build |
|
|
stage: build |
|
|
|
|
|
@ -7,7 +7,7 @@ git: |
|
|
dist: trusty |
|
|
dist: trusty |
|
|
|
|
|
|
|
|
before_script: |
|
|
before_script: |
|
|
- git clone git://github.com/mendersoftware/mendertesting |
|
|
- git clone git://github.com/mendersoftware/mendertesting /tmp/mendertesting |
|
|
|
|
|
|
|
|
# Rename the branch we're on, so that it's not in the way for the |
|
|
# Rename the branch we're on, so that it's not in the way for the |
|
|
# subsequent fetch. It's ok if this fails, it just means we're not on any |
|
|
# subsequent fetch. It's ok if this fails, it just means we're not on any |
|
|
@ -21,7 +21,7 @@ before_script: |
|
|
|
|
|
|
|
|
script: |
|
|
script: |
|
|
# Check commit compliance. |
|
|
# Check commit compliance. |
|
|
- mendertesting/check_commits.sh |
|
|
- /tmp/mendertesting/check_commits.sh |
|
|
# Check licenses |
|
|
# Check licenses |
|
|
- mendertesting/check_license.sh |
|
|
- /tmp/mendertesting/check_license.sh |
|
|
- ./docker-build |
|
|
- ./docker-build |
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
FROM ubuntu:18.04 |
|
|
FROM ubuntu:18.04 |
|
|
|
|
|
|
|
|
ARG MENDER_ARTIFACT_VERSION=3.2.0 |
|
|
ARG MENDER_ARTIFACT_VERSION=3.2.1 |
|
|
ARG GOLANG_VERSION=1.11.2 |
|
|
ARG GOLANG_VERSION=1.11.2 |
|
|
|
|
|
|
|
|
RUN apt-get update && apt-get install -y \ |
|
|
RUN apt-get update && apt-get install -y \ |
|
|
|
|
|
@ -1,2 +1 @@ |
|
|
beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 LICENSE |
|
|
beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 LICENSE |
|
|
beb140be4cd64599bedc691a55b2729c9cc611a4b9d6ec44e01270105daf18a2 mendertesting/LICENSE |
|
|
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
FROM ubuntu:18.04 |
|
|
FROM ubuntu:18.04 |
|
|
|
|
|
|
|
|
ARG MENDER_ARTIFACT_VERSION=3.2.0 |
|
|
ARG MENDER_ARTIFACT_VERSION=3.2.1 |
|
|
|
|
|
|
|
|
RUN apt-get update && apt-get install -y \ |
|
|
RUN apt-get update && apt-get install -y \ |
|
|
wget \ |
|
|
wget \ |
|
|
|
|
|
@ -6,7 +6,7 @@ if [ -z "$IMAGE_NAME" ]; then |
|
|
IMAGE_NAME=mender-convert |
|
|
IMAGE_NAME=mender-convert |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
MENDER_CLIENT_VERSION="2.1.1" |
|
|
MENDER_CLIENT_VERSION="2.1.2" |
|
|
|
|
|
|
|
|
DOCKER_ARGS="--build-arg mender_client_version=${MENDER_CLIENT_VERSION}" |
|
|
DOCKER_ARGS="--build-arg mender_client_version=${MENDER_CLIENT_VERSION}" |
|
|
|
|
|
|
|
|
|
