Skip to content

Commit

Permalink
Merge pull request #10 from Cryptophobia/master
Browse files Browse the repository at this point in the history
chore(minio): upgrading go-dev image and renaming some things
  • Loading branch information
Cryptophobia committed Oct 10, 2020
2 parents b99ab0c + acdf534 commit 3ad295b
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 23 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
SHORT_NAME := minio

# dockerized development environment variables
REPO_PATH := github.com/deis/${SHORT_NAME}
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.20.0
REPO_PATH := github.com/teamhephy/${SHORT_NAME}
DEV_ENV_IMAGE := hephy/go-dev:v1.28.3
DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
DEV_ENV_PREFIX := docker run --env CGO_ENABLED=0 --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}

LDFLAGS := "-s -X main.version=${VERSION}"
BINDIR := ./rootfs/bin
DEV_REGISTRY ?= $(docker-machine ip deis):5000
DEIS_REGISTRY ?= ${DEV_REGISTRY}
#DEV_REGISTRY ?= $(docker-machine ip deis):5000
#DEIS_REGISTRY ?= ${DEV_REGISTRY}

IMAGE_PREFIX ?= deis
IMAGE_PREFIX ?= hephy

include versioning.mk

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Deis Minio v2

[![Build Status](https://travis-ci.org/teamhephy/minio.svg?branch=master)](https://travis-ci.org/teamhephy/minio)
[![Go Report Card](http://goreportcard.com/badge/deis/minio)](http://goreportcard.com/report/deis/minio)
[![Go Report Card](http://goreportcard.com/badge/teamhephy/minio)](http://goreportcard.com/report/teamhephy/minio)
[![Docker Repository on Quay](https://quay.io/repository/deisci/minio/status "Docker Repository on Quay")](https://quay.io/repository/deisci/minio)

Deis (pronounced DAY-iss) Workflow is an open source Platform as a Service (PaaS) that adds a developer-friendly layer to any [Kubernetes](http://kubernetes.io) cluster, making it easy to deploy and manage applications on your own servers.
Expand Down
4 changes: 2 additions & 2 deletions boot.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"strings"
"text/template"

"github.com/deis/minio/src/healthsrv"
"github.com/deis/pkg/utils"
minio "github.com/minio/minio-go"
"github.com/teamhephy/minio/src/healthsrv"
"github.com/teamhephy/pkg/utils"
)

const (
Expand Down
7 changes: 3 additions & 4 deletions charts/minio/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: minio
home: https://github.com/deisthree/minio
home: https://github.com/teamhephy/minio
version: <Will be populated by the ci before publishing the chart>
description: Minio Object Storage in Kubernetes, used by Deis Workflow.
description: Minio Object Storage in Kubernetes, used by Hephy Workflow.
maintainers:
- name: Deis Team
email: engineering@deis.com
- email: team@teamhephy.com
12 changes: 6 additions & 6 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions glide.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package: github.com/deis/minio
package: github.com/teamhephy/minio
ignore:
- appengine
- appengine/datastore
Expand All @@ -15,8 +15,8 @@ import:
version: a83829b6f1293c91addabc89d0571c246397bbf4
- package: gopkg.in/yaml.v2
version: a83829b6f1293c91addabc89d0571c246397bbf4
- package: github.com/deis/pkg
version: 189ed6bd6b6aa6629b72c2c5472095e176eec8a6
- package: github.com/teamhephy/pkg
version: 777f37a30108edaf6a2bd4e423cde34ec12870fd
subpackages:
- /utils
- package: github.com/minio/minio-go
Expand Down
2 changes: 1 addition & 1 deletion src/healthsrv/healthz_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"log"
"net/http"

"github.com/deis/minio/src/storage"
minio "github.com/minio/minio-go"
"github.com/teamhephy/minio/src/storage"
)

type healthZResp struct {
Expand Down
2 changes: 1 addition & 1 deletion src/healthsrv/healthz_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"
"time"

"github.com/deis/minio/src/storage"
minio "github.com/minio/minio-go"
"github.com/teamhephy/minio/src/storage"
)

func TestHealthzHandler(t *testing.T) {
Expand Down

0 comments on commit 3ad295b

Please sign in to comment.