Skip to content

Commit

Permalink
Merged in feature/SHIBUI-1770 (pull request #464)
Browse files Browse the repository at this point in the history
SHIBUI-1770

Approved-by: Dmitriy Kopylenko
  • Loading branch information
chasegawa authored and Jonathan Johnson committed Apr 12, 2021
2 parents f4c91a9 + c468233 commit beefbb0
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 0 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -400,3 +400,9 @@ rdurable
build-no-tests

beacon/spring/out

# Eclipse junk
*.classpath
*.settings
*.project
*bin
15 changes: 15 additions & 0 deletions docker-build/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM ubuntu:18.04
MAINTAINER docker@unicon.net

RUN apt-get clean \
&& apt-get -y update \
&& apt-get install -y curl nano vim java-common python-minimal

RUN curl -L0 https://corretto.aws/downloads/latest/amazon-corretto-11-x64-linux-jdk.deb --output corretto11.deb

RUN dpkg --install corretto11.deb \
&& rm -f corretto11.deb

COPY includes/ /

CMD ["/bin/bash", "/runProject.sh"]
14 changes: 14 additions & 0 deletions docker-build/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
version: "3"

services:
builder:
image: unicon/shibuibuilder:1.0
# If you want a container to docker exec into for manual operations, comment out the environment RUN_COMMAND
environment:
RUN_COMMAND: 'sh gradlew build'
volumes:
- ../:/shib-idp-ui

volumes:
shib-idp-ui:

10 changes: 10 additions & 0 deletions docker-build/includes/runProject.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

if [ "$RUN_COMMAND" != "" ] ;
then
cd shib-idp-ui
exec $RUN_COMMAND;
else
tail -f /dev/null
fi

18 changes: 18 additions & 0 deletions docker-build/readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
BUILD IMAGE: docker build --tag unicon/shibuibuilder:1.0 .

USE:
If you want to simple use the existing version, you should be able to pull the image from the unicon docker hub site.
Otherwise, build the image first using the above command.

After building, if you wish to simply execute the build command using the docker-compose file in this folder do:
> docker-compose up

(or add the -d flag to the end if you don't wish to view the build output)

The container will stop once the gradle build command has completed.

If you wish to keep the docker container running for use as a build env, comment out the environment section of the
docker-compose file and then start the container and docker exec into the running container to perform whatever build
tasks you desire.

You can also alter the default "build" target in the docker-compose file as needed.

0 comments on commit beefbb0

Please sign in to comment.