small comment fixes

2017-09-14 14:17:05 -03:00 · 2017-09-14 14:17:05 -03:00 · 1868c27103
parent ab82cb39f7
commit 1868c27103
13 changed files with 60 additions and 63 deletions
--- a/alpine/dev/Dockerfile
+++ b/alpine/dev/Dockerfile
@ -22,20 +22,20 @@ FROM alpine
 ARG WOLFSSL_VERSION

 RUN set -eux \
-    # installing deps
+    # install deps
    && apk add --no-cache --virtual .build-deps \
-    autoconf \
-    automake \
-    g++ \
-    libtool \
-    make \
-    openssl \
+        autoconf \
+        automake \
+        g++ \
+        libtool \
+        make \
+        openssl \

-    # downloading source files
+    # download source files
    && wget https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}.zip \
    && unzip v${WOLFSSL_VERSION}.zip \

-    # building and installing wolfssl
+    # build and install wolfssl
    && cd wolfssl-${WOLFSSL_VERSION} \
    && ./autogen.sh \
    && ./configure \
--- a/alpine/lib/Dockerfile
+++ b/alpine/lib/Dockerfile
@ -22,20 +22,20 @@ FROM alpine
 ARG WOLFSSL_VERSION

 RUN set -eux \
-    # installing deps
+    # install deps
    && apk add --no-cache --virtual .build-deps \
-    autoconf \
-    automake \
-    g++ \
-    libtool \
-    make \
-    openssl \
+        autoconf \
+        automake \
+        g++ \
+        libtool \
+        make \
+        openssl \

-    # downloading source files
+    # download source files
    && wget https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}.zip \
    && unzip v${WOLFSSL_VERSION}.zip \

-    # building and installing wolfssl
+    # build and install wolfssl
    && cd wolfssl-${WOLFSSL_VERSION} \
    && ./autogen.sh \
    && ./configure \
--- a/alpine/test/Dockerfile
+++ b/alpine/test/Dockerfile
@ -22,12 +22,12 @@ FROM alpine
 # install dependencies
 RUN set -eux \
    && apk add --no-cache --virtual .deps \
-    autoconf \
-    automake \
-    g++ \
-    libtool \
-    make \
-    openssl
+        autoconf \
+        automake \
+        g++ \
+        libtool \
+        make \
+        openssl

 ARG WOLFSSL_VERSION

--- a/centos/dev/Dockerfile
+++ b/centos/dev/Dockerfile
@ -22,7 +22,7 @@ FROM centos
 ARG WOLFSSL_VERSION

 RUN set -eux \
-    # installing deps
+    # install deps
    && buildDeps=' \
        autoconf \
        automake \
@ -32,13 +32,13 @@ RUN set -eux \
    ' \
    && yum install -y $buildDeps \

-    # downloading source files
-    && curl -LS \
-        https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}.zip \
+    # download source files
+    && curl \
+        -LS https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}.zip \
        -o v${WOLFSSL_VERSION}.zip \
    && unzip v${WOLFSSL_VERSION}.zip \

-    # building and installing wolfssl
+    # build and install wolfssl
    && cd wolfssl-${WOLFSSL_VERSION} \
    && ./autogen.sh \
    && ./configure \
--- a/centos/lib/Dockerfile
+++ b/centos/lib/Dockerfile
@ -22,7 +22,7 @@ FROM centos
 ARG WOLFSSL_VERSION

 RUN set -eux \
-    # installing deps
+    # install deps
    && buildDeps=' \
        autoconf \
        automake \
@ -32,13 +32,13 @@ RUN set -eux \
    ' \
    && yum install -y $buildDeps \

-    # downloading source files
+    # download source files
    && curl -LS \
        https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}.zip \
        -o v${WOLFSSL_VERSION}.zip \
    && unzip v${WOLFSSL_VERSION}.zip \

-    # building and installing wolfssl
+    # build and install wolfssl
    && cd wolfssl-${WOLFSSL_VERSION} \
    && ./autogen.sh \
    && ./configure \
--- a/centos/test/Dockerfile
+++ b/centos/test/Dockerfile
@ -34,8 +34,8 @@ ARG WOLFSSL_VERSION

 # download source files
 RUN set -eux \
-    && curl -LS \
-        https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}.zip \
+    && curl \
+        -LS https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}.zip \
        -o v${WOLFSSL_VERSION}.zip \
    && unzip v${WOLFSSL_VERSION}.zip \
    && rm v${WOLFSSL_VERSION}.zip
--- a/debian/dev/Dockerfile
+++ b/debian/dev/Dockerfile
@ -22,7 +22,7 @@ FROM debian
 ARG WOLFSSL_VERSION

 RUN set -eux \
-    # installing build deps
+    # install deps
    && buildDeps=' \
        autoconf \
        automake \
@ -37,14 +37,14 @@ RUN set -eux \
    && apt-get install -y --no-install-recommends $buildDeps \
    && rm -r /var/lib/apt/lists/* \

-    # downloading source files
+    # download source files
    && curl \
        -LS https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}.zip \
        -o v${WOLFSSL_VERSION}.zip \
    && unzip v${WOLFSSL_VERSION}.zip \
    && rm v${WOLFSSL_VERSION}.zip \

-    # building and installing wolfssl
+    # build and install wolfssl
    && cd wolfssl-${WOLFSSL_VERSION} \
    && ./autogen.sh \
    && ./configure \
@ -66,7 +66,7 @@ RUN set -eux \
    && make install \
    && ldconfig \

-    # cleaning building deps
+    # cleanup
    && cd .. \
    && rm -r wolfssl-${WOLFSSL_VERSION} \
    && apt-get purge -y --auto-remove $buildDeps
--- a/debian/lib/Dockerfile
+++ b/debian/lib/Dockerfile
@ -22,7 +22,7 @@ FROM debian
 ARG WOLFSSL_VERSION

 RUN set -eux \
-    # installing build deps
+    # install deps
    && buildDeps=' \
        autoconf \
        automake \
@ -37,14 +37,14 @@ RUN set -eux \
    && apt-get install -y --no-install-recommends $buildDeps \
    && rm -r /var/lib/apt/lists/* \

-    # downloading source files
+    # download source files
    && curl \
        -LS https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}.zip \
        -o v${WOLFSSL_VERSION}.zip \
    && unzip v${WOLFSSL_VERSION}.zip \
    && rm v${WOLFSSL_VERSION}.zip \

-    # building and installing wolfssl
+    # build and install wolfssl
    && cd wolfssl-${WOLFSSL_VERSION} \
    && ./autogen.sh \
    && ./configure \
@ -66,7 +66,7 @@ RUN set -eux \
    && make install-exec \
    && ldconfig \

-    # cleaning building deps
+    # cleanup
    && cd .. \
    && rm -r wolfssl-${WOLFSSL_VERSION} \
    && apt-get purge -y --auto-remove $buildDeps
--- a/debian/test/Dockerfile
+++ b/debian/test/Dockerfile
@ -1,5 +1,3 @@
-# Dockerfile
-#
 # Copyright (C) 2006-2017 wolfSSL Inc.
 #
 # This file is part of wolfSSL.
@ -21,7 +19,7 @@
 ARG WOLFSSL_VERSION=3.12.0-stable
 FROM debian

-# installing build deps
+# install deps
 RUN set -eux \
    && buildDeps=' \
        autoconf \
@ -39,7 +37,7 @@ RUN set -eux \

 ARG WOLFSSL_VERSION

-# downloading source files
+# download source files
 RUN set -eux \
    && curl \
        -LS https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}.zip \
@ -47,7 +45,7 @@ RUN set -eux \
    && unzip v${WOLFSSL_VERSION}.zip \
    && rm v${WOLFSSL_VERSION}.zip

-# building and installing wolfssl
+# build and test wolfssl
 RUN set -eux \
    && cd wolfssl-${WOLFSSL_VERSION} \
    && ./autogen.sh \
@ -59,7 +57,7 @@ RUN set -eux \
    && make \
    && make check

-# create testing package
+# create example package
 RUN set -eux \
    && mkdir /wolfssl \
    && tar -czvf /wolfssl/examples.tar.gz \
--- a/ubuntu/dev/Dockerfile
+++ b/ubuntu/dev/Dockerfile
@ -22,7 +22,7 @@ FROM ubuntu
 ARG WOLFSSL_VERSION

 RUN set -eux \
-    # installing build deps
+    # install deps
    && buildDeps=' \
        autoconf \
        automake \
@ -37,14 +37,14 @@ RUN set -eux \
    && apt-get install -y --no-install-recommends $buildDeps \
    && rm -r /var/lib/apt/lists/* \

-    # downloading source files
+    # download source files
    && curl \
        -LS https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}.zip \
        -o v${WOLFSSL_VERSION}.zip \
    && unzip v${WOLFSSL_VERSION}.zip \
    && rm v${WOLFSSL_VERSION}.zip \

-    # building and installing wolfssl
+    # build and install wolfssl
    && cd wolfssl-${WOLFSSL_VERSION} \
    && ./autogen.sh \
    && ./configure \
@ -66,7 +66,7 @@ RUN set -eux \
    && make install \
    && ldconfig \

-    # cleaning building deps
+    # cleanup
    && cd .. \
    && rm -r wolfssl-${WOLFSSL_VERSION} \
    && apt-get purge -y --auto-remove $buildDeps
--- a/ubuntu/lib/Dockerfile
+++ b/ubuntu/lib/Dockerfile
@ -22,7 +22,7 @@ FROM ubuntu
 ARG WOLFSSL_VERSION

 RUN set -eux \
-    # installing build deps
+    # install deps
    && buildDeps=' \
        autoconf \
        automake \
@ -37,14 +37,14 @@ RUN set -eux \
    && apt-get install -y --no-install-recommends $buildDeps \
    && rm -r /var/lib/apt/lists/* \

-    # downloading source files
+    # download source files
    && curl \
        -LS https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}.zip \
        -o v${WOLFSSL_VERSION}.zip \
    && unzip v${WOLFSSL_VERSION}.zip \
    && rm v${WOLFSSL_VERSION}.zip \

-    # building and installing wolfssl
+    # build and install wolfssl
    && cd wolfssl-${WOLFSSL_VERSION} \
    && ./autogen.sh \
    && ./configure \
@ -66,7 +66,7 @@ RUN set -eux \
    && make install-exec \
    && ldconfig \

-    # cleaning building deps
+    # cleanup
    && cd .. \
    && rm -r wolfssl-${WOLFSSL_VERSION} \
    && apt-get purge -y --auto-remove $buildDeps
--- a/ubuntu/sid/Dockerfile
+++ b/ubuntu/sid/Dockerfile
@ -16,6 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA

+ARG WOLFSSL_PACKAGES=libwolfssl12 libwolfssl-dev
 FROM ubuntu

 # activate WOLFSSL_INSTALLS arg after FROM
@ -29,7 +30,7 @@ RUN set -eux \
    && gpg --keyserver pgpkeys.mit.edu --recv-key 7638D0442B90D010 \
    && gpg -a --export 7638D0442B90D010 | apt-key add - \

-    # installs wolfssl from sid
+    # install wolfssl
    && echo "deb http://ftp.it.debian.org/debian sid main contrib non-free" \
        > /etc/apt/sources.list.d/wolfssl.list \
    && apt-get update \
--- a/ubuntu/test/Dockerfile
+++ b/ubuntu/test/Dockerfile
@ -1,5 +1,3 @@
-# Dockerfile
-#
 # Copyright (C) 2006-2017 wolfSSL Inc.
 #
 # This file is part of wolfSSL.
@ -21,7 +19,7 @@
 ARG WOLFSSL_VERSION=3.12.0-stable
 FROM ubuntu

-# installing build deps
+# install deps
 RUN set -eux \
    && buildDeps=' \
        autoconf \
@ -39,7 +37,7 @@ RUN set -eux \

 ARG WOLFSSL_VERSION

-# downloading source files
+# download source files
 RUN set -eux \
    && curl \
        -LS https://github.com/wolfSSL/wolfssl/archive/v${WOLFSSL_VERSION}.zip \
@ -47,7 +45,7 @@ RUN set -eux \
    && unzip v${WOLFSSL_VERSION}.zip \
    && rm v${WOLFSSL_VERSION}.zip

-# building and installing wolfssl
+# build and test wolfssl
 RUN set -eux \
    && cd wolfssl-${WOLFSSL_VERSION} \
    && ./autogen.sh \
@ -59,7 +57,7 @@ RUN set -eux \
    && make \
    && make check

-# create testing package
+# create example package
 RUN set -eux \
    && mkdir /wolfssl \
    && tar -czvf /wolfssl/examples.tar.gz \