aboutsummaryrefslogtreecommitdiffstats
path: root/sidecar/fproxy/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'sidecar/fproxy/src/main')
-rw-r--r--sidecar/fproxy/src/main/assembly/descriptor.xml29
-rw-r--r--sidecar/fproxy/src/main/docker/Dockerfile31
2 files changed, 41 insertions, 19 deletions
diff --git a/sidecar/fproxy/src/main/assembly/descriptor.xml b/sidecar/fproxy/src/main/assembly/descriptor.xml
new file mode 100644
index 0000000..eb645f2
--- /dev/null
+++ b/sidecar/fproxy/src/main/assembly/descriptor.xml
@@ -0,0 +1,29 @@
+<assembly xmlns="http_://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+ xmlns:xsi="http_://www.__w3.org/2001/XMLSchema-instance"
+ xsi:SchemaLocation="http_://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http_://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>build</id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/src/main/bin</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>Dockerfile</exclude>
+ <exclude>*.sh</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/sidecar/fproxy/src/main/docker/Dockerfile b/sidecar/fproxy/src/main/docker/Dockerfile
index d91f0e3..4537e24 100644
--- a/sidecar/fproxy/src/main/docker/Dockerfile
+++ b/sidecar/fproxy/src/main/docker/Dockerfile
@@ -1,35 +1,28 @@
-FROM ubuntu:14.04
+FROM openjdk:8-alpine
ARG MICRO_HOME=/opt/app/fproxy
ARG BIN_HOME=$MICRO_HOME/bin
ARG JAR_FILE=fproxy-exec.jar
-RUN apt-get update
-
-# Install and setup java8
-RUN apt-get update && apt-get install -y software-properties-common
-## sudo -E is required to preserve the environment. If you remove that line, it will most like freeze at this step
-RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk
-
-RUN sudo dpkg --purge --force-depends ca-certificates-java
-RUN sudo apt-get install ca-certificates-java
+RUN apk update && \
+ apk add ca-certificates
## Setup JAVA_HOME, this is useful for docker commandline
-ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)
+ENV JAVA_HOME usr/lib/jvm/java-1.8-openjdk
RUN export JAVA_HOME
# Build up the deployment folder structure
RUN mkdir -p $MICRO_HOME
-COPY ${JAR_FILE} $MICRO_HOME
-RUN mkdir -p $BIN_HOME
-COPY *.sh $BIN_HOME
-RUN chmod 755 $BIN_HOME/*
-RUN ln -s /logs $MICRO_HOME/logs
-RUN mkdir /logs
+WORKDIR $MICRO_HOME
+COPY maven/fproxy/ .
+RUN chmod 755 $BIN_HOME/* && \
+ mkdir /logs && \
+ ln -s /logs $MICRO_HOME/logs
# Create the appuser
-RUN groupadd -r appgroup && \
- useradd -r -u 1001 -g appgroup appuser && \
+RUN addgroup --system appgroup && \
+ adduser --system --uid 1001 --ingroup appgroup appuser && \
chown -R appuser:appgroup $MICRO_HOME && \
chmod 777 /logs
USER appuser
+
CMD ["/opt/app/fproxy/bin/start.sh"]