Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add info labels to the ElasTest docker images. #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add info labels to the ElasTest docker images. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76a4041
Add info labels to the ElasTest docker images.
franciscoRdiaz Jan 4, 2018
3d60a97
Add info labels to the ElasTest docker images.
franciscoRdiaz Jan 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ node('docker'){

stage "Build REST API image - Package"
echo ("building..")
def rest_api_image = docker.build("elastest/ebs:latest","./rest-api")
sh 'cd rest-api; docker build --build-arg GIT_COMMIT=$(git rev-parse HEAD) --build-arg COMMIT_DATE=$(git log -1 --format=%cd --date=format:%Y-%m-%dT%H:%M:%S) -f rest-api/Dockerfile . -t elastest/ebs:latest'
def rest_api_image = docker.image("elastest/ebs:latest")

stage "Build Spark Base image - Package"
echo ("building..")
def spark_base_image = docker.build("elastest/ebs-spark:latest","./spark")
sh 'cd spark; docker build --build-arg GIT_COMMIT=$(git rev-parse HEAD) --build-arg COMMIT_DATE=$(git log -1 --format=%cd --date=format:%Y-%m-%dT%H:%M:%S) . -t elastest/ebs-spark:latest'
def spark_base_image = docker.image("elastest/ebs-spark:latest")

// Run EBS docker-compose
stage "Run EBS docker-compose"
Expand Down
8 changes: 7 additions & 1 deletion rest-api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
FROM gliderlabs/alpine

# Set labels
LABEL maintainer="[email protected]"
LABEL version="0.1.0"
LABEL description="Builds the Elastest Bigdata service docker image."
ARG GIT_COMMIT=unspecified
LABEL git_commit=$GIT_COMMIT
ARG COMMIT_DATE=unspecified
LABEL commit_date=$COMMIT_DATE
ARG VERSION=unspecified
LABEL version=$VERSION

WORKDIR /app
COPY . /app
Expand Down
8 changes: 8 additions & 0 deletions spark/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@ FROM ubuntu:14.04

MAINTAINER [email protected]

# Set labels
ARG GIT_COMMIT=unspecified
LABEL git_commit=$GIT_COMMIT
ARG COMMIT_DATE=unspecified
LABEL commit_date=$COMMIT_DATE
ARG VERSION=unspecified
LABEL version=$VERSION


####installing [software-properties-common] so that we can use [apt-add-repository] to install Java8
RUN apt-get update -y && apt-get install software-properties-common -y \
Expand Down