diff --git a/installer/roles/image_build/templates/Dockerfile.j2 b/installer/roles/image_build/templates/Dockerfile.j2 index e5f3ce05bc..ee674ace09 100644 --- a/installer/roles/image_build/templates/Dockerfile.j2 +++ b/installer/roles/image_build/templates/Dockerfile.j2 @@ -160,7 +160,7 @@ RUN ln -s /var/lib/awx/venv/awx/bin/awx-manage /usr/bin/awx-manage {% endif %} # Create default awx rsyslog config -ADD {% if build_dev|bool %}tools/docker-compose/{% endif %}rsyslog.conf /var/lib/awx/rsyslog/rsyslog.conf +ADD {% if build_dev|bool %}installer/roles/image_build/files/{% endif %}rsyslog.conf /var/lib/awx/rsyslog/rsyslog.conf ## File mappings {% if build_dev|bool %} @@ -232,4 +232,4 @@ EXPOSE 8052 ENTRYPOINT ["tini", "--"] CMD /usr/bin/launch_awx.sh VOLUME /var/lib/nginx -{% endif %} \ No newline at end of file +{% endif %} diff --git a/tools/docker-compose/rsyslog.conf b/tools/docker-compose/rsyslog.conf deleted file mode 100644 index ce31c14e9c..0000000000 --- a/tools/docker-compose/rsyslog.conf +++ /dev/null @@ -1,7 +0,0 @@ -$WorkDirectory /var/lib/awx/rsyslog -$MaxMessageSize 700000 -$IncludeConfig /var/lib/awx/rsyslog/conf.d/*.conf -module(load="imuxsock" SysSock.Use="off") -input(type="imuxsock" Socket="/var/run/awx-rsyslog/rsyslog.sock" unlink="on") -template(name="awx" type="string" string="%msg%") -action(type="omfile" file="/dev/null")