Merge branch 'develop' into dist/ubuntu/bionic/develop

misc/containers/hydra/Dockerfile

@@ -0,0 +1,18 @@
+FROM oryd/hydra:v1.4.2-alpine
+
+USER root
+
+COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint
+RUN chmod a+x /usr/local/bin/docker-entrypoint
+
+COPY first-run.sh /usr/local/bin/docker-first-run
+RUN chmod a+x /usr/local/bin/docker-first-run
+
+COPY hydra-init.d /hydra-init.d
+
+RUN mkdir -p /home/ory && chown -R ory: /home/ory
+USER ory
+
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
+
+CMD ["hydra", "serve", "all"]

misc/containers/hydra/docker-entrypoint.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -xeo pipefail
+
+LIFECYCLEFLAGS_DIR="$HOME/.container-lifecycle"
+
+mkdir -p "$LIFECYCLEFLAGS_DIR"
+
+if [ ! -f "$LIFECYCLEFLAGS_DIR/first-run" ]; then
+    /usr/local/bin/docker-first-run
+    touch "$LIFECYCLEFLAGS_DIR/first-run"
+fi
+
+exec "$@"

misc/containers/hydra/first-run.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+hydra migrate sql -e -y
+
+hydra serve all --dangerous-force-http &
+HYDRA_PID=$!
+run-parts --exit-on-error /hydra-init.d
+kill $HYDRA_PID

misc/containers/hydra/hydra-init.d/create-client

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -x
+
+hydra clients create \
+    --id daddy \
+    --secret daddycool \
+    -n Daddy \
+    -a email,email_verified,openid \
+    --token-endpoint-auth-method client_secret_post \
+    --post-logout-callbacks http://localhost:8081/logout/redirect \
+    -c http://localhost:8081/oauth2/callback

misc/containers/postgres/Dockerfile

@@ -0,0 +1,3 @@
+FROM postgres:12-alpine
+
+COPY ./initdb.d /docker-entrypoint-initdb.d

misc/containers/postgres/initdb.d/init-databases.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+    CREATE USER hydra WITH ENCRYPTED PASSWORD 'hydra';
+    CREATE DATABASE hydra;
+    GRANT ALL PRIVILEGES ON DATABASE hydra TO hydra;
+EOSQL
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+    CREATE USER daddy WITH ENCRYPTED PASSWORD 'daddy';
+    CREATE DATABASE daddy;
+    GRANT ALL PRIVILEGES ON DATABASE daddy TO daddy;
+    ALTER DATABASE daddy OWNER TO daddy;
+EOSQL

misc/containers/super-graph/Dockerfile

@@ -1,36 +0,0 @@
-FROM alpine:edge AS build
-
-ARG HTTP_PROXY=
-ARG HTTPS_PROXY=
-ARG http_proxy=
-ARG https_proxy=
-
-ARG SUPERGRAPH_VERSION=v0.14.17
-ARG WAITFORIT_VERSION=v2.4.1
-
-RUN apk add --no-cache go make git curl bash ca-certificates
-
-RUN git clone https://github.com/dosco/super-graph \
-    && export PATH="$PATH:/root/go/bin" \
-    && export CGO_ENABLED=0 \
-    && cd super-graph \
-    && git checkout ${SUPERGRAPH_VERSION} \
-    && make SHELL='bash -x' build
-
-RUN curl -sL \
-    -o /usr/local/bin/waitforit \
-    https://github.com/maxcnunes/waitforit/releases/download/${WAITFORIT_VERSION}/waitforit-linux_amd64
-
-FROM alpine:3.11
-
-COPY --from=build /super-graph/super-graph /usr/local/bin/super-graph
-COPY --from=build /usr/local/bin/waitforit /usr/local/bin/waitforit
-
-RUN chmod +x /usr/local/bin/waitforit
-
-WORKDIR /app
-
-COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint
-RUN chmod +x /usr/local/bin/docker-entrypoint
-
-CMD ["/usr/local/bin/docker-entrypoint"]

misc/containers/super-graph/docker-entrypoint.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -eo pipefail
-
-if [ ! -f /container-lifecycle/first_run ]; then
-    waitforit -debug -host $SG_DATABASE_HOST -port 5432
-    super-graph db:migrate up
-    super-graph db:seed
-    mkdir /container-lifecycle
-    touch /container-lifecycle/first_run
-fi
-
-super-graph serv

misc/script/release

@@ -0,0 +1,119 @@
+#!/bin/bash
+
+set -eo pipefail
+
+OS_TARGETS=(linux)
+ARCH_TARGETS=${ARCH_TARGETS:-amd64 arm 386}
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+PROJECT_DIR="$DIR/../.."
+
+function build {
+
+  local name=$1
+  local srcdir=$2
+  local os=$3
+  local arch=$4
+
+  local dirname="$name-$os-$arch"
+  local destdir="$PROJECT_DIR/release/$dirname"
+
+  rm -rf "$destdir"
+  mkdir -p "$destdir"
+
+  echo "building $dirname..."
+
+  CGO_ENABLED=0 GOOS="$os" GOARCH="$arch" go build \
+    -ldflags="-s -w -X main.GitCommit=$(current_commit_ref) -X main.ProjectVersion=$(current_version)" \
+    -gcflags=-trimpath="${PWD}" \
+    -asmflags=-trimpath="${PWD}" \
+    -o "$destdir/bin/$name" \
+    "$srcdir"
+
+  if [ ! -z "$(which upx)" ]; then
+    upx --best "$destdir/bin/$name"
+  fi
+
+}
+
+function current_commit_ref {
+  git rev-list -1 HEAD
+}
+
+function current_version {
+  local latest_tag=$(git describe --abbrev=0 2>/dev/null)
+  echo ${latest_tag:-0.0.0}
+}
+
+function copy {
+
+  local name=$1
+  local os=$2
+  local arch=$3
+  local src=$4
+  local dest=$5
+
+  local dirname="$name-$os-$arch"
+  local destdir="$PROJECT_DIR/release/$dirname"
+
+  echo "copying '$src' to '$destdir/$dest'..."
+
+  mkdir -p "$(dirname $destdir/$dest)"
+
+  cp -rfL $src "$destdir/$dest"
+
+}
+
+function dump_default_conf {
+  # Generate and copy configuration file
+  local command=$1
+  local os=$2
+  local arch=$3
+  local tmp_conf=$(mktemp)
+
+  go run "$PROJECT_DIR/cmd/$command" -dump-config > "$tmp_conf"
+  copy "$command" $os $arch "$tmp_conf" "$command.conf"
+  rm -f "$tmp_conf"
+}
+
+function compress {
+
+  local name=$1
+  local os=$2
+  local arch=$3
+
+  local dirname="$name-$os-$arch"
+  local destdir="$PROJECT_DIR/release/$dirname"
+
+  echo "compressing $dirname..."
+  tar -czf "$destdir.tar.gz" -C "$destdir/../" "$dirname"
+}
+
+function release_server {
+
+  local os=$1
+  local arch=$2
+  
+  build 'server' "$PROJECT_DIR/cmd/server" $os $arch
+
+  dump_default_conf 'server' $os $arch
+  
+  copy 'server' $os $arch "$PROJECT_DIR/README.md" "README.md"
+  copy 'server' $os $arch "$PROJECT_DIR/client/dist" "public"
+
+  compress 'server' $os $arch
+
+}
+
+function main {
+
+  make client-dist
+
+  for os in ${OS_TARGETS[@]}; do
+    for arch in ${ARCH_TARGETS[@]}; do
+      release_server $os $arch
+    done
+  done
+}
+
+main