move to github actiion + do.sh / update deps

Author: fiji-flo

.dockerignore

@@ -5,4 +5,4 @@
 node_modules/
 /proxy
 **/.terraform/
-!target/x86_64-unknown-linux-musl/release/dino-park-whoami
+!target/release/dino-park-whoami

.github/workflows/rust.yml

@@ -0,0 +1,27 @@
+name: Rust
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run fmt
+      run: cargo fmt --all -- --check
+    - name: Clippy
+      run: cargo clippy --all --all-features -- -D warnings
+    - name: Build
+      run: cargo build --all --all-features --verbose
+    - name: Run tests
+      run: cargo test --all --all-features
+

.travis.yml

@@ -1,15 +1,15 @@
 FROM rust:latest
 
-RUN rustup target add x86_64-unknown-linux-musl
- RUN apt-get update && apt-get install -y \
-    musl-tools \
- && rm -rf /var/lib/apt/lists/*
 WORKDIR /usr/src/app
 COPY . .
-RUN cargo build --release --target x86_64-unknown-linux-musl
+RUN cargo build --release
+
+FROM debian:10-slim
 
-FROM alpine:latest  
+RUN apt-get update && apt-get install -y \
+    ca-certificates \
+ && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /root/
-COPY --from=0 /usr/src/app/target/x86_64-unknown-linux-musl/release/dino-park-whoami .
-CMD ["./dino-park-whoami"]
+COPY --from=0 /usr/src/app/target/release/dino-park-whoami .
+CMD ["./dino-park-whoami"]

Dockerfile

@@ -1,5 +1,9 @@
-FROM alpine:latest  
+FROM debian:10-slim
+
+RUN apt-get update && apt-get install -y \
+    ca-certificates \
+ && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /root/
-COPY target/x86_64-unknown-linux-musl/release/dino-park-whoami .
-CMD ["./dino-park-whoami"]
+COPY target/release/dino-park-whoami .
+CMD ["./dino-park-whoami"]

Dockerfile.local

@@ -7,6 +7,7 @@ phases:
   pre_build:
     commands:
       - export COMMIT_SHA=$CODEBUILD_RESOLVED_SOURCE_VERSION
+      - export REV=$COMMIT_SHA
       - export CODEBUILD_WEBHOOK_TRIGGER=${CODEBUILD_WEBHOOK_TRIGGER:-branch/master}
       - export DEPLOY_ENV=$(echo $CODEBUILD_WEBHOOK_TRIGGER | sed -e 's/tag\/.*-\(.*\)/\1/' | sed -e 's/branch\/master/dev/')
       - export PR=$(if case $CODEBUILD_WEBHOOK_TRIGGER in pr/*) ;; *) false;; esac; then echo 1; fi)
@@ -17,12 +18,12 @@ phases:
       - aws ecr get-login --region us-west-2 --no-include-email | bash
   build:
     commands:
-      - if [ "$PR" = 1 ]; then myke package-local; fi
-      - if [ "$MASTER" = 1 ]; then myke package-local --rev=$COMMIT_SHA push-image --rev=$COMMIT_SHA; fi
+      - if [ "$PR" = 1 ]; then ./do.sh package_local; fi
+      - if [ "$MASTER" = 1 ]; then ./do.sh package_local && ./do.sh push_image; fi
   post_build:
     commands:
       - echo "Environment is ${DEPLOY_ENV}"
-      - if [ "$PR" = "" ]; then myke deploy --deploy_env=$DEPLOY_ENV --rev=$COMMIT_SHA; fi
+      - if [ "$PR" = "" ]; then ./do.sh deploy; fi
 cache:
   paths:
     - $HOME/.cargo

buildspec.yml

@@ -1,18 +1,18 @@
 export RUSTUP_HOME=/usr/local/rustup
 export CARGO_HOME=/usr/local/cargo
 export PATH=/usr/local/cargo/bin:$PATH
-export RUST_VERSION=1.42.0
+export RUST_VERSION=1.46.0
 
 set -eux
 dpkgArch="$(dpkg --print-architecture)"
 case "${dpkgArch##*-}" in
-    amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='ad1f8b5199b3b9e231472ed7aa08d2e5d1d539198a15c5b1e53c746aad81d27b' ;;
-    armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='6c6c3789dabf12171c7f500e06d21d8004b5318a5083df8b0b02c0e5ef1d017b' ;;
-    arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='26942c80234bac34b3c1352abbd9187d3e23b43dae3cf56a9f9c1ea8ee53076d' ;;
-    i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='27ae12bc294a34e566579deba3e066245d09b8871dc021ef45fc715dced05297' ;;
+    amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='49c96f3f74be82f4752b8bffcf81961dea5e6e94ce1ccba94435f12e871c3bdb' ;;
+    armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='5a2be2919319e8778698fa9998002d1ec720efe7cb4f6ee4affb006b5e73f1be' ;;
+    arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='d93ef6f91dab8299f46eef26a56c2d97c66271cea60bf004f2f088a86a697078' ;;
+    i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='e3d0ae3cfce5c6941f74fed61ca83e53d4cd2deb431b906cbd0687f246efede4' ;;
     *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;;
-esac
-url="https://static.rust-lang.org/rustup/archive/1.21.1/${rustArch}/rustup-init"
+esac;
+url="https://static.rust-lang.org/rustup/archive/1.22.1/${rustArch}/rustup-init";
 wget "$url"
 echo "${rustupSha256} *rustup-init" | sha256sum -c -
 chmod +x rustup-init
@@ -23,11 +23,6 @@ rustup --version
 cargo --version
 rustc --version
 
-rustup target add x86_64-unknown-linux-musl
-apt-get update
-apt-get install -y musl-tools
+rustup target add x86_64-unknown-linux-gnu
 HELM_INSTALL_DIR=/bin
-curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash
-curl -L -o myke https://github.com/fiji-flo/myke/releases/download/0.9.11/myke-0.9.11-x86_64-unknown-linux-musl
-chmod +x ./myke
-mv ./myke /bin/myke
+curl https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash

ci/install_deps.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+set -e
+
+NAME=dino-park-whoami
+DOCKER_REGISTRY=320464205386.dkr.ecr.us-west-2.amazonaws.com
+REV=${REV:-latest}
+
+compile_release() {
+  cargo build --release
+}
+
+docker_build_local() {
+  docker build -t ${DOCKER_REGISTRY}/${NAME}:${REV} -f Dockerfile.local .
+}
+
+docker_build() {
+  docker build -t ${DOCKER_REGISTRY}/${NAME}:${REV} -f Dockerfile .
+}
+
+package_local() {
+  compile_release
+  docker_build_local
+}
+
+push_image() {
+  docker push ${DOCKER_REGISTRY}/${NAME}:${REV}
+}
+
+deploy() {
+  if [ -z ${DEPLOY_ENV} ]; then exit 1; fi
+  helm template -f k8s/values.yaml -f k8s/values/${DEPLOY_ENV}.yaml \
+    --set docker_registry=${DOCKER_REGISTRY},rev=${REV} k8s/ | kubectl apply -f -
+}
+
+if [ -z ${1} ]
+then
+  echo "usage: $0 [command]"
+  echo
+  echo "commands:"
+  declare -F | sed  "s/declare -f /\t/g"
+else
+  $1
+fi