Skip to content

Commit

Permalink
Merge pull request #1 from ing-bank/init
Browse files Browse the repository at this point in the history
Init
  • Loading branch information
Bongani authored Oct 10, 2018
2 parents 749a1c8 + 07e3908 commit 977cddf
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 2 deletions.
Empty file added .gitignore
Empty file.
27 changes: 27 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
sudo: required

services:
- docker

env:
global:
- DOCKER_REPO: nielsdenissen/airlock-dev-mariadb
- secure: JxmhYNOX5z/xwEn8VUwaxLFJb03Airn46kAJwqWzI9rfhc/hViHXBoX6o17QqbN9ToWm6iXX0pK7mVm4q5ZLt24y4cwoK+mSiG9JaWuqPREIB9nRVGnHTN7CUWjk4+51s95HlDQM6y8gvmV2+X1FQq4msZu94GKLNDpg56s042JjSFGUl1q3brXIC02Cc2GcLl+n179FFSvr1U9uWLhXLm51FNn+6aEik3r8m+OOOnSca66HpJpVaAVjDMna7jcSOGQugc8/cCF22KrNux2h+VurlZY2wieEnkaD+9jP7Lj5k13CKypvw01YzGP58stZaT4ThvuXFMqltLfUB9CVXQ5gKEyAPeo36/ahbEpdll+qYF2MQ3tTGTsP9px3elPpGurWdwinCY9+QnAMzOkzYXh3a7+/2OKdJhrXQ1cWenB3sSDSUkC8dNiVWIG3+WakBplrsWQY8QLRvnCeis3XbusoG/M4EY/0zgB+IEDGzveI0M+TkyTtF81hAfVf7qnkEjCY+UwuZ4RN6ZmMt1hUQKXcEUntmJ0NoOiySSQvyUbkqPZkVS3oFkceavpdcExcAWngdNe6VwVkKA0KLceIGNl0K8GkKhHl8FfmOKqCMo/g2N+Rajf/RKYF5ZvXwKRIAQiOvcDfKA8m8tL94USwgzs6GTrglxalXyxb9FqEu3w=
- secure: dXc34ghhu6vhZQT0UBJgbHVr8dKPJthwd0y17FUTTluMxjk9m7j+xvt//9XnLWjiFbGqvGBMZCKQNIeaNGDkuNCeSHSpZOEJNNJ1Pie4tOhrGLU4NOcZTqhpskjBeUQAw66eCCq3yt2nbE3t4tPn4q8XJMXNTwSmJV/SmtxNUmqmzgU51WKyAasHm4a+f0iVPEF8ePMBBQ9lq1GWHyg+lSX/+sXJpTQZapbSBDtgb7+vckxJoO7KZHnG+2B8u7fJnjqk9iW2+a7VR/vguw+XAqmHbEo9m2SBMhjpuQFYgZMq2TOrc0NFj3q7iFsjGdVTWsgrOd3oMXJ0d+edeLtuXdfP7LD4pj0sII/a04IQM1XbIhZc2VsDemBf5DszReVTGQi1tA8tg/M67jaKl/x9NuhLLh2Xj/kfcRBeoG2IYp5Hd/KkR52mexvuT5sstOiV1NUxtTTukh89ks2t8s/F7DnHGjM8hrgtkHK3p0tsKXYBlDK/aHe8AWZ3l8ZWFXLBMtaVXOcK3R8CKPVTG+i9tiJUkWofhRKbS1aClUZK7jjGGlz1DWuS8jlqnhlMX6A0QMC2asqlf3DjFKLwXS/97iYkZ/Mx99WTDcToE73gEZDqms74i7nlDlexnmza44GwwvtNGfnyc+9NdTUSEd973tOuZqnYK0cwNyxEOc4DCNg=

# We will not build an image on the master tag, thereby forcing people to use tagged versions only
# Also there is an issue with using TRAVIS_BRANCH for PRs since this variable will be set to the target of the PR (e.g. master for PR to master) and then build an image for master unwanted before the merge happened
script:
- echo "Running pipeline for branch ${TRAVIS_BRANCH}"
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- export DOCKER_TAG="${TRAVIS_BRANCH/\//_}"
- if [ "${TRAVIS_BRANCH}" != "master" ]; then
echo "Build image for with name $DOCKER_REPO:$DOCKER_TAG";
docker pull $DOCKER_REPO:latest;
travis_wait 80 docker build --quiet -t $DOCKER_REPO:$DOCKER_TAG .;
docker push $DOCKER_REPO:$DOCKER_TAG;
fi
- if [ -n "$TRAVIS_TAG" ]; then
docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:latest;
docker push $DOCKER_REPO:latest;
fi
5 changes: 5 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM mariadb:10.3.9

ENV MYSQL_ROOT_PASSWORD admin

COPY database /docker-entrypoint-initdb.d/
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
# gargoyle-test-mariadb
MariaDB test image for the Gargoyle project.
[![Build Status](https://travis-ci.org/ing-bank/airlock-dev-mariadb.svg?branch=master)](https://travis-ci.org/ing-bank/airlock-dev-mariadb)
[![](https://images.microbadger.com/badges/image/nielsdenissen/airlock-dev-mariadb:latest.svg)](https://microbadger.com/images/nielsdenissen/airlock-dev-mariadb:latest)


# Airlock Dev - Maria DB

This repo contains a MariaDB setup used for integration testing by the [Airlock project](https://github.com/ing-bank/airlock).
20 changes: 20 additions & 0 deletions database/airlockdb.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
CREATE DATABASE airlock;
USE airlock;

CREATE TABLE users(
username VARCHAR(512) NOT NULL PRIMARY KEY,
accesskey VARCHAR(512) NOT NULL UNIQUE,
secretkey VARCHAR(512) NOT NULL,
isNPA BOOLEAN NOT NULL
) COMMENT='User DB for Airlock';

CREATE TABLE tokens(
sessiontoken VARCHAR(512) NOT NULL PRIMARY KEY,
username VARCHAR(512) NOT NULL,
expirationtime DATETIME NOT NULL,
assumedgroup VARCHAR(512),
CONSTRAINT `fk_tokens_username`
FOREIGN KEY (username) REFERENCES users (username)
ON DELETE CASCADE
ON UPDATE CASCADE
) COMMENT='Token DB for Airlock';

0 comments on commit 977cddf

Please sign in to comment.