Skip to content

Commit

Permalink
modify docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
Philipp Kraus committed Jan 25, 2018
1 parent 2e4e84f commit 9b1be12
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 44 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
@@ -0,0 +1,2 @@
temp
tmp
4 changes: 1 addition & 3 deletions .gitignore
@@ -1,6 +1,7 @@
*.*

!.gitignore
!.dockerignore
!Dockerfile
!circle.yml
!pom.xml
Expand All @@ -12,15 +13,12 @@
!*.properties

!src/site/*.doxyfile
!src/site/*.htm*
!src/site/*.css
!src/site/*.xml
!src/site/*.xslt
!src/site/*.graffle

!src/analysis/**/*.xml
!src/analysis/**/*.txt
!src/analysis/**/*.md

src/main/antlr4/org/lightjason/agentspeak/grammar/AgentSpeak.g4
src/main/antlr4/org/lightjason/agentspeak/grammar/Terminal.g4
Expand Down
28 changes: 2 additions & 26 deletions Dockerfile
@@ -1,35 +1,11 @@
FROM alpine:3.7
FROM lightjason/docker:jdk


# --- configuration section ----------------------
ENV DOCKERIMAGE_AGENTSPEAK_VERSION HEAD

ENV DOCKERIMAGE_MAVEN_VERSION 3.5.2
ENV DOCKERIMAGE_GLIBC_VERSION 2.26-r0
ENV DOCKERIMAGE_JAVA_DOWNLOAD http://download.oracle.com/otn-pub/java/jdk/9.0.4+11/c2514751926b4512b076cc82f959763f/jdk-9.0.4_linux-x64_bin.tar.gz


# --- dependencies section -----------------------
RUN wget -O /etc/apk/keys/sgerrand.rsa.pub https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub
RUN wget -O /tmp/glibc.apk https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$DOCKERIMAGE_GLIBC_VERSION/glibc-$DOCKERIMAGE_GLIBC_VERSION.apk
RUN wget -O /tmp/glibc-bin.apk https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$DOCKERIMAGE_GLIBC_VERSION/glibc-bin-$DOCKERIMAGE_GLIBC_VERSION.apk
RUN wget -O /tmp/glibc-i18n.apk https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$DOCKERIMAGE_GLIBC_VERSION/glibc-i18n-$DOCKERIMAGE_GLIBC_VERSION.apk

RUN wget -O /tmp/maven.tar.gz http://archive.apache.org/dist/maven/maven-3/$DOCKERIMAGE_MAVEN_VERSION/binaries/apache-maven-$DOCKERIMAGE_MAVEN_VERSION-bin.tar.gz && mkdir -p /opt/maven && tar --strip 1 -zxvf /tmp/maven.tar.gz -C /opt/maven
RUN wget -O /tmp/java.tar.gz --no-check-certificate -c --header "Cookie: oraclelicense=accept-securebackup-cookie" $DOCKERIMAGE_JAVA_DOWNLOAD && mkdir -p /opt/java && tar --strip 1 -zxvf /tmp/java.tar.gz -C /opt/java

RUN apk --no-cache update &&\
apk --no-cache upgrade &&\
apk --no-cache add git doxygen graphviz openssh-client ca-certificates /tmp/glibc.apk /tmp/glibc-bin.apk /tmp/glibc-i18n.apk
RUN /usr/glibc-compat/bin/localedef -i en_US -f UTF-8 en_US.UTF-8


# --- machine configuration section --------------
ENV JAVA_HOME /opt/java
ENV PATH /opt/maven/bin:$JAVA_HOME/bin:$PATH

# --- content configuration section --------------
RUN git clone https://github.com/LightJason/AgentSpeak.git /tmp/agentspeak
RUN cd /tmp/agentspeak && git checkout $DOCKERIMAGE_AGENTSPEAK_VERSION
RUN cd /tmp/agentspeak && mvn install -DskipTests

RUN rm -rf /tmp/*
16 changes: 1 addition & 15 deletions circle.yml
Expand Up @@ -4,7 +4,7 @@ jobs:
build:
working_directory: ~/agentspeak
docker:
- image: maven:3.5.2-jdk-9-slim
- image: lightjason/docker:jdk

branches:
ignore:
Expand All @@ -17,22 +17,8 @@ jobs:

environment:
TZ: "/usr/share/zoneinfo/Europe/Berlin"
DOXYGEN_VERSION: "1.8.14"

steps:
- run: env
- run:
name: System Update
command: apt-get -y update
- run:
name: Install Toolchain
command: apt-get -y install apt-utils git graphviz xsltproc wget
- run:
name: Doxygen Download
command: wget -O /tmp/doxygen.tar.gz http://ftp.stack.nl/pub/users/dimitri/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz && tar xf /tmp/doxygen.tar.gz -C /tmp
- run:
name: Download Saxon
command: wget -O /tmp/saxon.zip https://sourceforge.net/projects/saxon/files/Saxon-HE/9.8/SaxonHE9-8-0-4J.zip/download && unzip -d /tmp /tmp/saxon.zip saxon9he.jar
- checkout
- run:
name: Git Clean
Expand Down

0 comments on commit 9b1be12

Please sign in to comment.