Skip to content

Commit

Permalink
Update Dockerfile for newer Ubuntu level
Browse files Browse the repository at this point in the history
  • Loading branch information
ibmmqmet committed Aug 20, 2019
1 parent e92eaea commit f459b90
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Dockerfile
Expand Up @@ -12,15 +12,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG BASE_IMAGE=ubuntu:18.10
ARG BASE_IMAGE=ubuntu:19.04
FROM $BASE_IMAGE

ARG GOPATH_ARG="/go"

ENV GOVERSION=1.10 \
ENV GOVERSION=1.12 \
GOPATH=$GOPATH_ARG \
ORG="github.com/ibm-messaging" \
REPO="mq-golang"
ORG="github.com/ibm-messaging"


# Install the Go compiler and Git
RUN export DEBIAN_FRONTEND=noninteractive \
Expand Down Expand Up @@ -67,6 +67,7 @@ RUN chmod 777 $GOPATH/buildInDocker.sh

# Copy the rest of the source tree from this directory into the container
# And make sure it's readable by the id that will run the compiles (not just root)
ENV REPO="mq-golang"
COPY . $GOPATH/src/$ORG/$REPO
RUN chmod -R a+rx $GOPATH/src

Expand Down
4 changes: 4 additions & 0 deletions buildInDocker.sh
Expand Up @@ -27,6 +27,9 @@ echo "Running as " `id`
# Build the libraries so they can be used by other programs
cd $GOPATH/src

echo "Using compiler:"
go version

for pkg in $ORG/$REPO/ibmmq $ORG/$REPO/mqmetric
do
lib=`basename $pkg`
Expand All @@ -47,3 +50,4 @@ done

echo "Building program: mqitest"
go build -o bin/mqitest $srcdir/mqitest/mqitest.go

0 comments on commit f459b90

Please sign in to comment.