Merge branch 'master' of https://github.com/ot4i/ace-docker

Author: dan robinson

11.0.0.0/ace/ubuntu-1604/base/Dockerfile

@@ -31,14 +31,15 @@ RUN echo "ACE_11:" > /etc/debian_chroot \
   && sed -i 's/PASS_MIN_DAYS\t0/PASS_MIN_DAYS\t1/'  /etc/login.defs \
   && sed -i 's/PASS_MAX_DAYS\t99999/PASS_MAX_DAYS\t90/' /etc/login.defs
 
-# Create a user to run as
-RUN useradd --create-home --home-dir /home/aceuser -G mqbrkrs,sudo aceuser \
-  && sed -e 's/^%sudo	.*/%sudo	ALL=NOPASSWD:ALL/g' -i /etc/sudoers \
-  && su - aceuser -c '. /opt/ibm/ace-11.0.0.0/server/bin/mqsiprofile && mqsicreateworkdir /home/aceuser/ace-server' 
-
 # Copy in script files
 COPY *.sh /usr/local/bin/
 
+# Create a user to run as, create the ace workdir, and chmod script files
+RUN useradd --create-home --home-dir /home/aceuser -G mqbrkrs,sudo aceuser \
+  && sed -e 's/^%sudo	.*/%sudo	ALL=NOPASSWD:ALL/g' -i /etc/sudoers \
+  && su - aceuser -c '. /opt/ibm/ace-11.0.0.0/server/bin/mqsiprofile && mqsicreateworkdir /home/aceuser/ace-server' \
+  && chmod 755 /usr/local/bin/*
+
 # Set BASH_ENV to source mqsiprofile when using docker exec bash -c
 ENV BASH_ENV=/usr/local/bin/ace_env.sh
 

11.0.0.0/ace/ubuntu-1604/demo/Dockerfile

@@ -10,10 +10,10 @@ FROM ace:11.0.0.0
 ENV BAR1=Transformation_Map.bar
 
 # Copy in the bar file to a temporary directory
-COPY $BAR1 /tmp
+COPY --chown=aceuser $BAR1 /tmp
 
 # Unzip the BAR file; need to use bash to make the profile work
-RUN bash -c 'mqsicreateworkdir /home/aceuser/ace-server && mqsibar -w /home/aceuser/ace-server -a /tmp/$BAR1 -c'
+RUN bash -c 'mqsibar -w /home/aceuser/ace-server -a /tmp/$BAR1 -c'
 
 # Switch off the admin REST API for the server run, as we won't be deploying anything after start
 RUN sed -i 's/adminRestApiPort/#adminRestApiPort/g' /home/aceuser/ace-server/server.conf.yaml