Minor fix of maven project.

mabrarov · Nov 10, 2020 · 7ee7ef2 · 7ee7ef2
1 parent e1e66d3
commit 7ee7ef2
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 54 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
     command: '/helper/run.sh'
     environment:
       INIT_COMMAND: '/run.sh'
+      REDIS_CONFIG_DIR: '/config'
       REDIS_PORT: '6379'
       REDIS_LISTEN_BACKLOG: '128'
       REDIS_PROTECTED_MODE: 'no'

diff --git a/j2cli-builder-image/pom.xml b/j2cli-builder-image/pom.xml
@@ -22,21 +22,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
-                    <execution>
-                        <id>build-rootfs</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>rootfs</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <attach>false</attach>
-                            <descriptors>
-                                <descriptor>src/assembly/rootfs.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>build-docker-context</id>
                         <phase>generate-resources</phase>

diff --git a/j2cli-builder-image/src/assembly/docker-context.xml b/j2cli-builder-image/src/assembly/docker-context.xml
@@ -16,12 +16,5 @@
             <filtered>true</filtered>
             <lineEnding>unix</lineEnding>
         </fileSet>
-        <fileSet>
-            <outputDirectory/>
-            <directory>${project.build.directory}</directory>
-            <includes>
-                <include>rootfs.tar</include>
-            </includes>
-        </fileSet>
     </fileSets>
 </assembly>
diff --git a/j2cli-builder-image/src/assembly/rootfs.xml b/j2cli-builder-image/src/assembly/rootfs.xml
diff --git a/j2cli-builder-image/src/main/resources/Dockerfile b/j2cli-builder-image/src/main/resources/Dockerfile
@@ -10,10 +10,8 @@ RUN apt-get update && \
     "${venv_dir}/bin/pip" install --upgrade pip && \
     rm -rf /var/lib/apt/lists/*
 
-ADD ["rootfs.tar", "/"]
-
 RUN venv_dir="@j2cli.venv.dir@" && \
-    "${venv_dir}/bin/pip" install --disable-pip-version-check -r /usr/src/requirements.txt && \
+    "${venv_dir}/bin/pip" install --disable-pip-version-check j2cli[yaml]=="@j2cli.version@" && \
     output_file="@output.file@" && \
     mkdir -p "$(dirname "${output_file}")" && \
     ls -A -1 "${venv_dir}" \

diff --git a/j2cli-builder-image/src/main/resources/rootfs/usr/src/requirements.txt b/j2cli-builder-image/src/main/resources/rootfs/usr/src/requirements.txt
diff --git a/redis-image/src/assembly/docker-context.xml b/redis-image/src/assembly/docker-context.xml
@@ -16,13 +16,6 @@
             <filtered>true</filtered>
             <lineEnding>unix</lineEnding>
         </fileSet>
-        <fileSet>
-            <outputDirectory/>
-            <directory>${project.build.directory}</directory>
-            <includes>
-                <include>rootfs.tar</include>
-            </includes>
-        </fileSet>
     </fileSets>
     <dependencySets>
         <dependencySet>