100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Added Dockerfile lint to the CI pipeline
Michal Rutkaaaa1f3fe8664
diff --git a/.gitlab-ci.yml b/.gitlab-ci.ymlindex b9039dc6b..d8e55a07b 100644--- a/.gitlab-ci.yml+++ b/.gitlab-ci.yml@@ -1,13 +1,25 @@default:interruptible: trueimage: docker:latest+ services:+ - docker:dindtimeout: 1h 30m-docker-build-master:- # Official docker image.+lint-Dockerfile:+ stage: build+ script:+ - docker pull hadolint/hadolint+ - docker run --rm -i hadolint/hadolint < Dockerfile+ allow_failure: true++lint-swarm-Dockerfile:+ stage: build+ script:+ - docker pull hadolint/hadolint+ - docker run --rm -i hadolint/hadolint < ./manager/swarm.Dockerfile++build-master:stage: build- services:- - docker:dindbefore_script:- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY- docker login -u "$DOCKERHUB_USER" -p "$DOCKERHUB_PASSWORD"@@ -27,9 +39,6 @@ docker-build-master:- mastertest-master:- stage: test- services:- - docker:dindbefore_script:- docker run -v $(pwd):/openremote-v /var/run/docker.sock:/var/run/docker.sock "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"@@ -45,7 +54,7 @@ test-master:only:- master-deploy:+deploy-master:stage: deployscript:- echo Continous deploy TODOdiff --git a/manager/swarm.Dockerfile b/manager/swarm.Dockerfileindex 6bfacd50c..d5c85b0ee 100644--- a/manager/swarm.Dockerfile+++ b/manager/swarm.Dockerfile@@ -1,6 +1,7 @@+# hadolint ignore=DL3007FROM openremote/manager:latest AS manager+# hadolint ignore=DL3007FROM openremote/deployment:latest AS deployment-############ EDITS ABOVE THIS LINE SHOULD BE DONE IN ALL DOCKERFILES! ################FROM openjdk:8-jre# Add git commit label must be specified at build time using --build-arg GIT_COMMIT=dadadadadad@@ -25,5 +26,5 @@ RUN mkdir -p /deployment/extensionsCOPY --from=manager /opt/app/lib /opt/app/libCOPY --from=deployment /deployment/ /deployment/-+# hadolint ignore=DL3025ENTRYPOINT java $JAVA_OPTS -cp /opt/app/lib/*:/deployment/manager/extensions/* org.openremote.manager.Main