Merge pull request #110 from Cargill/rbuysse-dockerfile-cleanup

Dockerfile cleanup

Author: rbuysse

contracts/pike/Dockerfile

@@ -17,18 +17,19 @@ FROM ubuntu:bionic as grid-pike-builder
 RUN apt-get update \
 && apt-get install gnupg -y
 
+# Install base dependencies
 RUN echo "deb http://repo.sawtooth.me/ubuntu/nightly bionic universe" >> /etc/apt/sources.list \
  && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 44FC67F19B2466EA \
  || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 44FC67F19B2466EA) \
  && apt-get update \
  && apt-get install -y -q \
- curl \
- gcc \
- libssl-dev \
- libzmq3-dev \
- pkg-config \
- sabre-cli \
- unzip \
+    curl \
+    gcc \
+    libssl-dev \
+    libzmq3-dev \
+    pkg-config \
+    sabre-cli \
+    unzip \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 
@@ -42,30 +43,39 @@ RUN curl https://sh.rustup.rs -sSf > /usr/bin/rustup-init \
 RUN rustup update \
  && rustup target add wasm32-unknown-unknown
 
-# For Building Protobufs
-RUN curl -OLsS https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-linux-x86_64.zip \
- && unzip protoc-3.5.1-linux-x86_64.zip -d protoc3 \
- && rm protoc-3.5.1-linux-x86_64.zip
+# Install protoc
+RUN curl -OLsS https://github.com/google/protobuf/releases/download/v3.7.1/protoc-3.7.1-linux-x86_64.zip \
+ && unzip -o protoc-3.7.1-linux-x86_64.zip -d /usr/local \
+ && rm protoc-3.7.1-linux-x86_64.zip
 
-COPY ./sdk /sdk
+RUN mkdir /build
 
+# Copy grid sdk dependency
+COPY sdk/ /build/sdk/
+
+# Create empty cargo project
+WORKDIR /build
 RUN mkdir contracts \
  && USER=root cargo new --bin contracts/pike
-WORKDIR /contracts/pike
 
-# Build TP with dummy source in order to cache dependencies in Docker image.
-COPY ./contracts/pike/Cargo.toml ./Cargo.toml
-RUN cargo build --release
+# Copy over Cargo.toml file
+COPY contracts/pike/Cargo.toml /build/contracts/pike/Cargo.toml
 
-COPY contracts/pike/Cargo.toml contracts/pike/Cargo.lock* ./
-RUN cargo build
+# Do a release build to cache dependencies
+WORKDIR /build/contracts/pike
+RUN cargo build --release
 
+# Remove the auto-generated .rs files and the built files
 RUN rm src/*.rs
-COPY ./contracts/pike/src ./src
+RUN rm target/release/grid-pike-tp* target/release/deps/grid_pike*
+
+# Copy over source files
+COPY contracts/pike/src /build/contracts/pike/src
 
-RUN rm ./target/release/grid-pike-tp* ./target/release/deps/grid_pike*
+# Build the contract
 RUN cargo build --target wasm32-unknown-unknown --release
 
-COPY ./contracts/pike/pike.yaml ./pike.yaml
+# Copy the contract definition
+COPY contracts/pike/pike.yaml /build/contracts/pike/pike.yaml
 
 ENTRYPOINT []

contracts/product/Dockerfile

@@ -22,21 +22,21 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/nightly bionic universe" >> /etc/ap
  && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 44FC67F19B2466EA \
  || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 44FC67F19B2466EA) \
  && apt-get update \
-    && apt-get install -y -q \
-        build-essential \
-        curl \
-        gcc \
-        g++ \
-        libpq-dev \
-        libssl-dev \
-        libsasl2-dev \
-        libzmq3-dev \
-        openssl \
-        pkg-config \
-        sabre-cli \
-        unzip \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+ && apt-get install -y -q \
+    build-essential \
+    curl \
+    gcc \
+    g++ \
+    libpq-dev \
+    libssl-dev \
+    libsasl2-dev \
+    libzmq3-dev \
+    openssl \
+    pkg-config \
+    sabre-cli \
+    unzip \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
 
 ENV PATH=$PATH:/protoc3/bin:/root/.cargo/bin
 
@@ -46,33 +46,41 @@ RUN curl https://sh.rustup.rs -sSf > /usr/bin/rustup-init \
  && rustup-init -y
 
 RUN rustup update \
- && rustup default \
- && rustup target add wasm32-unknown-unknown --toolchain stable
+ && rustup target add wasm32-unknown-unknown
 
-# For Building Protobufs
-RUN curl -OLsS https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-linux-x86_64.zip \
-    && unzip -o protoc-3.5.1-linux-x86_64.zip -d /usr/local \
-    && rm protoc-3.5.1-linux-x86_64.zip
+# Install protoc
+RUN curl -OLsS https://github.com/google/protobuf/releases/download/v3.7.1/protoc-3.7.1-linux-x86_64.zip \
+ && unzip -o protoc-3.7.1-linux-x86_64.zip -d /usr/local \
+ && rm protoc-3.7.1-linux-x86_64.zip
 
-COPY ./sdk /sdk
+RUN mkdir /build
 
+# Copy grid sdk dependency
+COPY sdk/ /build/sdk/
+
+# Create empty cargo project
+WORKDIR /build
 RUN mkdir contracts \
    && USER=root cargo new --bin contracts/product
-WORKDIR /contracts/product
 
-# Build TP with dummy source in order to cache dependencies in Docker image.
-COPY ./contracts/product/Cargo.toml ./Cargo.toml
-RUN cargo build --release
+# Copy over Cargo.toml file
+COPY contracts/product/Cargo.toml /build/contracts/product/Cargo.toml
 
-COPY contracts/product/Cargo.toml contracts/product/Cargo.lock* ./
-RUN cargo build
+# Do a release build to cache dependencies
+WORKDIR /build/contracts/product
+RUN cargo build --release
 
+# Remove the auto-generated .rs files and the built files
 RUN rm src/*.rs
-COPY ./contracts/product/src ./src
-
 RUN rm ./target/release/grid-product-tp* ./target/release/deps/grid_product*
+
+# Copy over source files
+COPY contracts/product/src /build/contracts/product/src
+
+# Build the contract
 RUN cargo build --target wasm32-unknown-unknown --release
 
-COPY ./contracts/product/product.yaml ./product.yaml
+# Copy the contract definition
+COPY contracts/product/product.yaml /build/contracts/product/product.yaml
 
 ENTRYPOINT []

contracts/schema/Dockerfile

@@ -22,21 +22,21 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/nightly bionic universe" >> /etc/ap
  && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 44FC67F19B2466EA \
  || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 44FC67F19B2466EA) \
  && apt-get update \
-    && apt-get install -y -q \
-        build-essential \
-        curl \
-        gcc \
-        g++ \
-        libpq-dev \
-        libssl-dev \
-        libsasl2-dev \
-        libzmq3-dev \
-        openssl \
-        pkg-config \
-        sabre-cli \
-        unzip \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+ && apt-get install -y -q \
+    build-essential \
+    curl \
+    gcc \
+    g++ \
+    libpq-dev \
+    libssl-dev \
+    libsasl2-dev \
+    libzmq3-dev \
+    openssl \
+    pkg-config \
+    sabre-cli \
+    unzip \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
 
 ENV PATH=$PATH:/protoc3/bin:/root/.cargo/bin
 
@@ -48,30 +48,39 @@ RUN curl https://sh.rustup.rs -sSf > /usr/bin/rustup-init \
 RUN rustup update \
  && rustup target add wasm32-unknown-unknown
 
-# For Building Protobufs
-RUN curl -OLsS https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-linux-x86_64.zip \
-    && unzip -o protoc-3.5.1-linux-x86_64.zip -d /usr/local \
-    && rm protoc-3.5.1-linux-x86_64.zip
+# Install protoc
+RUN curl -OLsS https://github.com/google/protobuf/releases/download/v3.7.1/protoc-3.7.1-linux-x86_64.zip \
+ && unzip -o protoc-3.7.1-linux-x86_64.zip -d /usr/local \
+ && rm protoc-3.7.1-linux-x86_64.zip
 
-COPY ./sdk /sdk
+RUN mkdir /build
 
+# Copy grid sdk dependency
+COPY sdk/ /build/sdk/
+
+# Create empty cargo project
+WORKDIR /build
 RUN mkdir contracts \
  && USER=root cargo new --bin contracts/schema
-WORKDIR /contracts/schema
 
-# Build TP with dummy source in order to cache dependencies in Docker image.
-COPY ./contracts/schema/Cargo.toml ./Cargo.toml
-RUN cargo build --release
+# Copy over Cargo.toml file
+COPY contracts/schema/Cargo.toml /build/contracts/schema/Cargo.toml
 
-COPY contracts/schema/Cargo.toml contracts/schema/Cargo.lock* ./
-RUN cargo build
+# Do a release build to cache dependencies
+WORKDIR /build/contracts/schema
+RUN cargo build --release
 
+# Remove the auto-generated .rs files and the built files
 RUN rm src/*.rs
-COPY ./contracts/schema/src ./src
+RUN rm target/release/grid-schema-tp* target/release/deps/grid_schema*
+
+# Copy over source files
+COPY contracts/schema/src /build/contracts/schema/src
 
-RUN rm ./target/release/grid-schema-tp* ./target/release/deps/grid_schema*
+# Build the contract
 RUN cargo build --target wasm32-unknown-unknown --release
 
-COPY ./contracts/schema/schema.yaml ./schema.yaml
+# Copy the contract definition
+COPY contracts/schema/schema.yaml /build/contracts/schema/schema.yaml
 
 ENTRYPOINT []

contracts/track_and_trace/Dockerfile

@@ -22,21 +22,21 @@ RUN echo "deb http://repo.sawtooth.me/ubuntu/nightly bionic universe" >> /etc/ap
  && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 44FC67F19B2466EA \
  || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 44FC67F19B2466EA) \
  && apt-get update \
-    && apt-get install -y -q \
-        build-essential \
-        curl \
-        gcc \
-        g++ \
-        libpq-dev \
-        libssl-dev \
-        libsasl2-dev \
-        libzmq3-dev \
-        openssl \
-        pkg-config \
-        sabre-cli \
-        unzip \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+ && apt-get install -y -q \
+    build-essential \
+    curl \
+    gcc \
+    g++ \
+    libpq-dev \
+    libssl-dev \
+    libsasl2-dev \
+    libzmq3-dev \
+    openssl \
+    pkg-config \
+    sabre-cli \
+    unzip \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
 
 ENV PATH=$PATH:/protoc3/bin:/root/.cargo/bin
 
@@ -48,30 +48,39 @@ RUN curl https://sh.rustup.rs -sSf > /usr/bin/rustup-init \
 RUN rustup update \
  && rustup target add wasm32-unknown-unknown
 
-# For Building Protobufs
-RUN curl -OLsS https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-linux-x86_64.zip \
-    && unzip -o protoc-3.5.1-linux-x86_64.zip -d /usr/local \
-    && rm protoc-3.5.1-linux-x86_64.zip
+# Install protoc
+RUN curl -OLsS https://github.com/google/protobuf/releases/download/v3.7.1/protoc-3.7.1-linux-x86_64.zip \
+ && unzip -o protoc-3.7.1-linux-x86_64.zip -d /usr/local \
+ && rm protoc-3.7.1-linux-x86_64.zip
 
-COPY ./sdk /sdk
+RUN mkdir /build
 
+# Copy grid sdk dependency
+COPY sdk/ /build/sdk/
+
+# Create empty cargo project
+WORKDIR /build
 RUN mkdir contracts \
  && USER=root cargo new --bin contracts/track_and_trace
-WORKDIR /contracts/track_and_trace
 
-# Build TP with dummy source in order to cache dependencies in Docker image.
-COPY ./contracts/track_and_trace/Cargo.toml ./Cargo.toml
-RUN cargo build --release
+# Copy over Cargo.toml file
+COPY contracts/track_and_trace/Cargo.toml /build/contracts/track_and_trace/Cargo.toml
 
-COPY contracts/track_and_trace/Cargo.toml contracts/track_and_trace/Cargo.lock* ./
-RUN cargo build
+# Do a release build to cache dependencies
+WORKDIR /build/contracts/track_and_trace
+RUN cargo build --release
 
+# Remove the auto-generated .rs files and the built files
 RUN rm src/*.rs
-COPY ./contracts/track_and_trace/src ./src
+RUN rm target/release/grid-track-and-trace-tp* target/release/deps/grid_track_and_trace*
+
+# Copy over source files
+COPY contracts/track_and_trace/src /build/contracts/track_and_trace/src
 
-RUN rm ./target/release/grid-track-and-trace-tp* ./target/release/deps/grid_track_and_trace*
+# Build the contract
 RUN cargo build --target wasm32-unknown-unknown --release
 
-COPY ./contracts/track_and_trace/track_and_trace.yaml ./track_and_trace.yaml
+# Copy the contract definition
+COPY contracts/track_and_trace/track_and_trace.yaml /build/contracts/track_and_trace/track_and_trace.yaml
 
 ENTRYPOINT []