diff --git a/docker-compose.yml b/docker-compose.yml index 9757c69..59cfb46 100644 --- 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 index 7d47a04..0b4c896 100644 --- a/j2cli-builder-image/pom.xml +++ b/j2cli-builder-image/pom.xml @@ -22,21 +22,6 @@ org.apache.maven.plugins maven-assembly-plugin - - build-rootfs - generate-resources - - single - - - rootfs - false - false - - src/assembly/rootfs.xml - - - build-docker-context generate-resources diff --git a/j2cli-builder-image/src/assembly/docker-context.xml b/j2cli-builder-image/src/assembly/docker-context.xml index 9b62c39..e313d87 100644 --- a/j2cli-builder-image/src/assembly/docker-context.xml +++ b/j2cli-builder-image/src/assembly/docker-context.xml @@ -16,12 +16,5 @@ true unix - - - ${project.build.directory} - - rootfs.tar - - diff --git a/j2cli-builder-image/src/assembly/rootfs.xml b/j2cli-builder-image/src/assembly/rootfs.xml deleted file mode 100644 index 6f809c9..0000000 --- a/j2cli-builder-image/src/assembly/rootfs.xml +++ /dev/null @@ -1,21 +0,0 @@ - - rootfs - - tar - - false - - - - ${project.basedir}/src/main/resources/rootfs - - **/*.txt - - 0444 - unix - true - - - diff --git a/j2cli-builder-image/src/main/resources/Dockerfile b/j2cli-builder-image/src/main/resources/Dockerfile index 5800839..972e193 100644 --- 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 deleted file mode 100644 index 47d8e38..0000000 --- a/j2cli-builder-image/src/main/resources/rootfs/usr/src/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -j2cli[yaml]==@j2cli.version@ \ No newline at end of file diff --git a/redis-image/src/assembly/docker-context.xml b/redis-image/src/assembly/docker-context.xml index ea8da82..9206562 100644 --- a/redis-image/src/assembly/docker-context.xml +++ b/redis-image/src/assembly/docker-context.xml @@ -16,13 +16,6 @@ true unix - - - ${project.build.directory} - - rootfs.tar - -