Skip to content

Commit 3891225

Browse files
author
Pradeep Kunchala
committed
Remove unrelated Docker changes from AMQ-9855 PR
1 parent de5ea98 commit 3891225

2 files changed

Lines changed: 1 addition & 22 deletions

File tree

assembly/src/docker/Dockerfile

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,14 @@ ENV ACTIVEMQ_OPTS $ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.
3232
# activemq_dist can point to a directory or a tarball on the local system
3333
ARG activemq_dist=NOT_SET
3434

35-
RUN groupadd -r activemq && useradd -r -g activemq -m activemq
36-
37-
COPY src/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
38-
RUN chmod +x /usr/local/bin/entrypoint.sh && chown activemq:activemq /usr/local/bin/entrypoint.sh
35+
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
3936

4037
# Install build dependencies and activemq
4138
ADD $activemq_dist $ACTIVEMQ_INSTALL_PATH
4239
RUN set -x && \
4340
cp -r $ACTIVEMQ_INSTALL_PATH/apache-activemq-* $ACTIVEMQ_HOME && \
4441
rm -r $ACTIVEMQ_INSTALL_PATH/apache-activemq-*
4542

46-
RUN ls -l $ACTIVEMQ_HOME && \
47-
chown -R activemq:activemq $ACTIVEMQ_HOME
48-
4943
EXPOSE 8161 61616 5672 61613 1883 61614 1099
50-
51-
STOPSIGNAL SIGTERM
52-
53-
USER activemq
54-
5544
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
5645
CMD ["activemq", "console"]

assembly/src/docker/entrypoint.sh

100644100755
Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
# limitations under the License.
1919
################################################################################
2020

21-
set -e
22-
2321
# Transport/connection security
2422
if [ -n "${ACTIVEMQ_CONNECTION_USER}" ]; then
2523
if [ -f "${ACTIVEMQ_HOME}/conf/connection.security.enabled" ]; then
@@ -80,12 +78,4 @@ if [ -n "${ACTIVEMQ_WEB_USER}" ]; then
8078
fi
8179
fi
8280

83-
_term() {
84-
echo "Received SIGTERM, stopping ActiveMQ..."
85-
activemq stop
86-
sleep 2
87-
}
88-
89-
trap _term TERM INT
90-
9181
exec "$@"

0 commit comments

Comments
 (0)