Skip to content

Commit fd6c700

Browse files
committed
chore(.travis.yml): add .travis.yml
1 parent 2ba61fd commit fd6c700

6 files changed

Lines changed: 37 additions & 7 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
rootfs/opt/
2+
contrib/ci/tmp/

.travis.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
language: go
2+
sudo: required
3+
services:
4+
- docker
5+
script:
6+
- make docker-build test
7+
notifications:
8+
slack:
9+
rooms:
10+
- drycc:xKmLlmJR4hfRAgVIOwdpAoC9#drycc

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include includes.mk versioning.mk
99
# the filepath to this repository, relative to $GOPATH/src
1010
REPO_PATH = github.com/drycc/registry
1111

12-
SHELL_SCRIPTS = $(wildcard _scripts/*.sh contrib/ci/*.sh)
12+
SHELL_SCRIPTS = $(wildcard rootfs/bin/* _scripts/*.sh contrib/ci/*.sh)
1313

1414
# The following variables describe the containerized development environment
1515
# and other build options

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Drycc Registry v2
22

3-
[![Build Status](https://ci.drycc.cc/job/registry/badge/icon)](https://ci.drycc.cc/job/registry)
3+
[![Build Status](https://travis-ci.org/drycc/registry.svg?branch=master)](https://travis-ci.org/drycc/registry)
44
[![Go Report Card](https://goreportcard.com/badge/github.com/drycc/registry)](https://goreportcard.com/report/github.com/drycc/registry)
55
[![Docker Repository on Quay](https://quay.io/repository/drycc/registry/status "Docker Repository on Quay")](https://quay.io/repository/drycc/registry)
66

contrib/ci/test.sh

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,26 @@
22

33
set -eoxf pipefail
44

5-
JOB=$(docker run -d "$1")
5+
CURRENT_DIR=$(cd "$(dirname "$0")"; pwd)
6+
7+
mkdir -p "${CURRENT_DIR}"/tmp/aws-user
8+
echo "us-east-1" > "${CURRENT_DIR}"/tmp/aws-user/region
9+
echo "registry-bucket" > "${CURRENT_DIR}"/tmp/aws-user/registry-bucket
10+
echo "1234567890123456789012345678901234567890" > "${CURRENT_DIR}"/tmp/aws-user/accesskey
11+
echo "1234567890123456789012345678901234567890" > "${CURRENT_DIR}"/tmp/aws-user/secretkey
12+
13+
MINIO_JOB=$(docker run -d \
14+
-v "${CURRENT_DIR}"/tmp/aws-user:/var/run/secrets/drycc/objectstore/creds \
15+
quay.io/drycc/minio:canary server /home/minio/)
16+
17+
18+
JOB=$(docker run -d \
19+
-v "${CURRENT_DIR}"/tmp/aws-user:/var/run/secrets/drycc/objectstore/creds \
20+
"$1")
21+
622
# let the registry run for a few seconds
723
sleep 5
824
# check that the registry is still up
925
docker logs "${JOB}"
1026
docker ps -q --no-trunc=true | grep "${JOB}"
11-
docker rm -f "${JOB}"
27+
docker rm -f "${JOB}" "${MINIO_JOB}"

rootfs/bin/normalize_storage

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@ ACCESS_KEY_FILE="/var/run/secrets/drycc/objectstore/creds/accesskey"
44
SECRET_KEY_FILE="/var/run/secrets/drycc/objectstore/creds/secretkey"
55

66
if [ -f $BUCKET_FILE ]; then
7-
export MINIO_BUCKET=$(cat "$BUCKET_FILE")
7+
MINIO_BUCKET=$(cat "$BUCKET_FILE")
8+
export MINIO_BUCKET
89
fi
910
if [ -f $ACCESS_KEY_FILE ]; then
10-
export MINIO_ACCESS_KEY=$(cat "$ACCESS_KEY_FILE")
11+
MINIO_ACCESS_KEY=$(cat "$ACCESS_KEY_FILE")
12+
export MINIO_ACCESS_KEY
1113
fi
1214
if [ -f $SECRET_KEY_FILE ]; then
13-
export MINIO_SECRET_KEY=$(cat "$SECRET_KEY_FILE")
15+
MINIO_SECRET_KEY=$(cat "$SECRET_KEY_FILE")
16+
export MINIO_SECRET_KEY
1417
fi
1518

1619
export MINIO_ENDPOINT=http://"${DRYCC_MINIO_SERVICE_HOST}:${DRYCC_MINIO_SERVICE_PORT}"

0 commit comments

Comments
 (0)