Skip to content

Commit

Permalink
update docs and remove docker from the pom
Browse files Browse the repository at this point in the history
  • Loading branch information
dev-mlb committed Apr 25, 2024
1 parent 30f75f3 commit 65ca65d
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 48 deletions.
12 changes: 1 addition & 11 deletions DEVELOPING.md
Expand Up @@ -601,18 +601,8 @@ a non-root user.

### Build Emissary Docker Image

Maven can be used to create the docker image. There is a profile that was created to run the docker image build that, by default,
has been turned off. We'll need to add the docker profile, along with the dist profile, to trigger an assembly. From the
project root, run the following maven command:

```
mvn clean install -Pdist,docker
```

Alternatively, we can use Docker directly. First run a full maven build and then run the ```docker build``` command:

We can use Docker directly to build Emissary:
```
mvn clean install -Pdist
docker build -f contrib/docker/Dockerfile . -t emissary
```

Expand Down
1 change: 0 additions & 1 deletion contrib/docker/Dockerfile
Expand Up @@ -14,7 +14,6 @@ ENV PROJECT_BASE=/opt/emissary
RUN rpm --import https://yum.corretto.aws/corretto.key \
&& curl -L -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo \
&& yum install -y java-${java_version}-amazon-corretto-devel \
&& yum update -y \
&& yum install -y which \
&& groupadd -g ${gid} ${group} \
&& useradd -u ${uid} -g ${group} -m -s /bin/bash ${user} \
Expand Down
1 change: 0 additions & 1 deletion contrib/docker/Dockerfile.ubi8
Expand Up @@ -14,7 +14,6 @@ ENV PROJECT_BASE=/opt/emissary
RUN rpm --import https://yum.corretto.aws/corretto.key \
&& curl -L -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo \
&& dnf install -y java-${java_version}-amazon-corretto-devel \
&& dnf update -y \
&& dnf install -y langpacks-en glibc-all-langpacks \
&& groupadd -g ${gid} ${group} \
&& useradd -u ${uid} -g ${group} -m -s /bin/sh ${user} \
Expand Down
35 changes: 0 additions & 35 deletions pom.xml
Expand Up @@ -1574,41 +1574,6 @@
<directory>${project.basedir}/target-idea</directory>
</build>
</profile>
<profile>
<id>docker</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>docker-build</id>
<goals>
<goal>exec</goal>
</goals>
<phase>install</phase>
<configuration>
<executable>docker</executable>
<workingDirectory>${project.basedir}</workingDirectory>
<arguments>
<argument>build</argument>
<argument>-f</argument>
<argument>contrib/docker/Dockerfile</argument>
<argument>-t</argument>
<argument>${project.artifactId}:${project.version}</argument>
<argument>-t</argument>
<argument>${project.artifactId}:latest</argument>
<argument>.</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jdk-release-flag</id>
<activation>
Expand Down

0 comments on commit 65ca65d

Please sign in to comment.