Skip to content

Commit

Permalink
fix merge conflicts from develop into master
Browse files Browse the repository at this point in the history
  • Loading branch information
jmccormick2001 committed Jun 6, 2019
2 parents 4dcbbf6 + 2d80322 commit b7ce49a
Show file tree
Hide file tree
Showing 344 changed files with 4,407 additions and 2,761 deletions.
29 changes: 18 additions & 11 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ endif
all: pgimages extras

# Build images that use postgres
pgimages: commands backup backrestrestore collect pgadmin4 pgbadger pgbouncer pgdump pgpool pgrestore postgres postgres-gis upgrade
pgimages: commands backup backrestrestore pgbasebackuprestore collect pgadmin4 pgbadger pgbench pgbouncer pgdump pgpool pgrestore postgres postgres-gis upgrade

# Build non-postgres images
extras: grafana prometheus scheduler
extras: node-exporter grafana prometheus scheduler

versiontest:
ifndef CCP_BASEOS
Expand Down Expand Up @@ -42,7 +42,6 @@ commands: pgc
pgc:
cd $(CCPROOT)/commands/pgc && go build pgc.go && mv pgc $(GOBIN)/pgc


#=============================================
# Targets that generate images (alphabetized)
#=============================================
Expand All @@ -55,6 +54,10 @@ backup: versiontest
docker build -t crunchy-backup -f $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.backup.$(CCP_BASEOS) .
docker tag crunchy-backup $(CCP_IMAGE_PREFIX)/crunchy-backup:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

pgbasebackuprestore:
docker build -t crunchy-pgbasebackup-restore -f $(CCP_BASEOS)/Dockerfile.pgbasebackup-restore.$(CCP_BASEOS) .
docker tag crunchy-pgbasebackup-restore $(CCP_IMAGE_PREFIX)/crunchy-pgbasebackup-restore:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

collect: versiontest
docker build -t crunchy-collect -f $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.collect.$(CCP_BASEOS) .
docker tag crunchy-collect $(CCP_IMAGE_PREFIX)/crunchy-collect:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)
Expand All @@ -63,6 +66,10 @@ grafana: versiontest
docker build -t crunchy-grafana -f $(CCP_BASEOS)/Dockerfile.grafana.$(CCP_BASEOS) .
docker tag crunchy-grafana $(CCP_IMAGE_PREFIX)/crunchy-grafana:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

node-exporter: versiontest
docker build -t crunchy-node-exporter -f $(CCP_BASEOS)/Dockerfile.node-exporter.$(CCP_BASEOS) .
docker tag crunchy-node-exporter $(CCP_IMAGE_PREFIX)/crunchy-node-exporter:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

pgadmin4: versiontest
docker build -t crunchy-pgadmin4 -f $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.pgadmin4.$(CCP_BASEOS) .
docker tag crunchy-pgadmin4 $(CCP_IMAGE_PREFIX)/crunchy-pgadmin4:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)
Expand All @@ -75,6 +82,10 @@ pgbadger: versiontest
docker build -t crunchy-pgbadger -f $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.pgbadger.$(CCP_BASEOS) .
docker tag crunchy-pgbadger $(CCP_IMAGE_PREFIX)/crunchy-pgbadger:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

pgbench: versiontest
docker build -t crunchy-pgbench -f $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.pgbench.$(CCP_BASEOS) .
docker tag crunchy-pgbench $(CCP_IMAGE_PREFIX)/crunchy-pgbench:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

pgbouncer: versiontest
docker build -t crunchy-pgbouncer -f $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.pgbouncer.$(CCP_BASEOS) .
docker tag crunchy-pgbouncer $(CCP_IMAGE_PREFIX)/crunchy-pgbouncer:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)
Expand All @@ -91,23 +102,19 @@ pgrestore: versiontest
docker build -t crunchy-pgrestore -f $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.pgrestore.$(CCP_BASEOS) .
docker tag crunchy-pgrestore $(CCP_IMAGE_PREFIX)/crunchy-pgrestore:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

pgsim:
cd sim && make
cp sim/build/crunchy-sim bin/crunchy-sim
docker build -t crunchy-sim -f $(CCP_BASEOS)/Dockerfile.sim.$(CCP_BASEOS) .
docker tag crunchy-sim $(CCP_IMAGE_PREFIX)/crunchy-sim:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

postgres: versiontest commands
cp $(GOBIN)/pgc bin/postgres
docker build -t crunchy-postgres -f $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.postgres.$(CCP_BASEOS) .
docker tag crunchy-postgres $(CCP_IMAGE_PREFIX)/crunchy-postgres:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

postgres-gis: versiontest commands
cp $(GOBIN)/pgc bin/postgres
docker build -t crunchy-postgres-gis -f $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.postgres-gis.$(CCP_BASEOS) .
expenv -f $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.postgres-gis.$(CCP_BASEOS) > $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.postgres-gis.$(CCP_BASEOS).tmp
docker build -t crunchy-postgres-gis -f $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.postgres-gis.$(CCP_BASEOS).tmp .
docker tag crunchy-postgres-gis $(CCP_IMAGE_PREFIX)/crunchy-postgres-gis:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)
rm -f $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.postgres-gis.$(CCP_BASEOS).tmp

prometheus: versiontest
prometheus: versiontest
docker build -t crunchy-prometheus -f $(CCP_BASEOS)/Dockerfile.prometheus.$(CCP_BASEOS) .
docker tag crunchy-prometheus $(CCP_IMAGE_PREFIX)/crunchy-prometheus:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

Expand Down
165 changes: 165 additions & 0 deletions Makefile.buildah
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
ifndef CCPROOT
export CCPROOT=$(GOPATH)/src/github.com/crunchydata/crunchy-containers
endif

.PHONY: all versiontest

# Default target
all: pgimages extras

# Build images that use postgres
pgimages: commands backup backrestrestore collect pgadmin4 pgbadger pgbench pgbouncer pgdump pgpool pgrestore postgres postgres-gis upgrade node-exporter

# Build non-postgres images
extras: grafana prometheus scheduler

versiontest:
ifndef CCP_BASEOS
$(error CCP_BASEOS is not defined)
endif
ifndef CCP_PGVERSION
$(error CCP_PGVERSION is not defined)
endif
ifndef CCP_PG_FULLVERSION
$(error CCP_PG_FULLVERSION is not defined)
endif
ifndef CCP_VERSION
$(error CCP_VERSION is not defined)
endif

setup:
$(CCPROOT)/bin/install-deps.sh

docbuild:
cd $CCPROOT && ./generate-docs.sh

#=============================================
# Targets that generate commands (alphabetized)
#=============================================

commands: pgc

pgc:
cd $(CCPROOT)/commands/pgc && go build pgc.go && mv pgc $(GOBIN)/pgc


#=============================================
# Targets that generate images (alphabetized)
#=============================================

backrestrestore: versiontest
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.backrest-restore.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-backrest-restore:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-backrest-restore:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-backrest-restore:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-backrest-restore:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-backrest-restore:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)


backup: versiontest
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.backup.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-backup:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-backup:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-backup:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-backup:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-backup:$(CCP_IMAGE_TAG)

collect: versiontest
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.collect.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-collect:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-collect:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-collect:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-collect:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-collect:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

grafana: versiontest
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/Dockerfile.grafana.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-grafana:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-grafana:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-grafana:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-grafana:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-grafana:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

node-exporter: versiontest
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/Dockerfile.node-exporter.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-node-exporter:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-node-exporter:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-node-exporter:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-node-exporter:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-node-exporter:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

pgadmin4: versiontest
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.pgadmin4.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-pgadmin4:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-pgadmin4:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-pgadmin4:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-pgadmin4:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-pgadmin4:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

pgbadger: versiontest
docker build -t $(CCP_IMAGE_PREFIX)/badgerserver:build -f $(CCP_BASEOS)/Dockerfile.badgerserver.$(CCP_BASEOS) .
docker create --name extract $(CCP_IMAGE_PREFIX)/badgerserver:build
docker cp extract:/go/src/github.com/crunchydata/crunchy-containers/badgerserver ./bin/pgbadger/badgerserver
docker rm -f extract
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.pgbadger.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-pgbadger:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-pgbadger:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-pgbadger:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-pgbadger:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-pgbadger:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

pgbench: versiontest
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.pgbench.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-pgbench:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-pgbench:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-pgbench:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-pgbench:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-pgbench:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

pgbouncer: versiontest
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.pgbouncer.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-pgbouncer:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-pgbouncer:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-pgbouncer:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-pgbouncer:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-pgbouncer:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

pgdump: versiontest
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.pgdump.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-pgdump:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-pgdump:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-pgdump:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-pgdump:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION) $(CCP_IMAGE_PREFIX)/crunchy-pgdump:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

pgpool: versiontest
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.pgpool.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-pgpool:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-pgpool:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-pgpool:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-pgpool:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-pgpool:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

pgrestore: versiontest
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.pgrestore.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-pgrestore:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-pgrestore:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-pgrestore:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-pgrestore:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-pgrestore:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

postgres: versiontest commands
cp $(GOBIN)/pgc bin/postgres
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.postgres.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-postgres:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-postgres:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-postgres:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-postgres:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-postgres:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

postgres-gis: versiontest commands
cp $(GOBIN)/pgc bin/postgres
expenv -f $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.postgres-gis.$(CCP_BASEOS) > $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.postgres-gis.$(CCP_BASEOS).tmp
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.postgres-gis.$(CCP_BASEOS).tmp -t $(CCP_IMAGE_PREFIX)/crunchy-postgres-gis:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-postgres-gis:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-postgres-gis:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-postgres-gis:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-postgres-gis:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)
rm -f $(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.postgres-gis.$(CCP_BASEOS).tmp

prometheus: versiontest
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/Dockerfile.prometheus.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-prometheus:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-prometheus:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-prometheus:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-prometheus:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-prometheus:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

sample-app: versiontest
docker build -t $(CCP_IMAGE_PREFIX)/sample-app-build:build -f $(CCP_BASEOS)/Dockerfile.sample-app-build.$(CCP_BASEOS) .
docker create --name extract $(CCP_IMAGE_PREFIX)/sample-app-build:build
docker cp extract:/go/src/github.com/crunchydata/sample-app/sample-app ./bin/sample-app
docker rm -f extract
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/Dockerfile.sample-app.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-sample-app:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-sample-app:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-sample-app:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-sample-app:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-sample-app:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

scheduler: versiontest
docker build -t $(CCP_IMAGE_PREFIX)/scheduler-build:build -f $(CCP_BASEOS)/Dockerfile.scheduler-build.$(CCP_BASEOS) .
docker create --name extract $(CCP_IMAGE_PREFIX)/scheduler-build:build
docker cp extract:/go/src/github.com/crunchydata/crunchy-containers/scheduler ./bin/scheduler
docker rm -f extract
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/Dockerfile.scheduler.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-scheduler:$(CCP_IMAGE_TAG) $(CCPROOT)
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-scheduler:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-scheduler:$(CCP_IMAGE_TAG)
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-scheduler:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-scheduler:$(CCP_BASEOS)-$(CCP_PG_FULLVERSION)-$(CCP_VERSION)

upgrade: versiontest
if [[ '$(CCP_PGVERSION)' != '9.5' ]]; then \
sudo --preserve-env buildah bud --squash -f $(CCPROOT)/$(CCP_BASEOS)/$(CCP_PGVERSION)/Dockerfile.upgrade.$(CCP_BASEOS) -t $(CCP_IMAGE_PREFIX)/crunchy-upgrade:$(CCP_IMAGE_TAG) $(CCPROOT) ;\
sudo --preserve-env buildah push $(CCP_IMAGE_PREFIX)/crunchy-upgrade:$(CCP_IMAGE_TAG) docker-daemon:$(CCP_IMAGE_PREFIX)/crunchy-upgrade:$(CCP_IMAGE_TAG) ;\
docker tag docker.io/$(CCP_IMAGE_PREFIX)/crunchy-upgrade:$(CCP_IMAGE_TAG) $(CCP_IMAGE_PREFIX)/crunchy-upgrade:$(CCP_IMAGE_TAG) ;\
fi

#=================
# Utility targets
#=================
push:
./bin/push-to-dockerhub.sh

-include Makefile.build
13 changes: 6 additions & 7 deletions README.adoc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
image::crunchy_logo.png[Crunchy Data Logo]

Latest Release: 2.3.1 {docdate}
Latest Release: 2.4.0 {docdate}

== General

Expand All @@ -18,12 +18,12 @@ link:https://crunchydata.github.io/crunchy-containers/stable/contributing/[Contr
[link=https://crunchydata.github.io/crunchy-containers/stable/]
image::btn.png[Official Documentation]

If you are looking for the latest documentation, please see the develop branch which is considered unstable. The development
documentation can be reviewed link:https://crunchydata.github.io/crunchy-containers/latest/installation/[here].
If you are looking for the latest documentation, please see the develop branch which is considered unstable. The development documentation can be reviewed
link:https://crunchydata.github.io/crunchy-containers/latest/[here].

== Getting Started

Complete build and install documentation is found link:https://crunchydata.github.io/crunchy-containers/stable/installation/[here]. The provided Dockerfiles build the containers
Complete build and install documentation is found link:https://crunchydata.github.io/crunchy-containers/stable/installation-guide/[here]. The provided Dockerfiles build the containers
on a Centos 7 base image and use the community PostgreSQL RPMs.

Crunchy provides a commercially supported version of these containers
Expand All @@ -35,8 +35,7 @@ can be found in the link:https://crunchydata.github.io/crunchy-containers/stable

== Usage

Various examples are provided in link:https://crunchydata.github.io/crunchy-containers/stable/getting-started/[the Getting Started documentation] for running in Docker,
Kubernetes, and OpenShift environments.
Various examples are provided in link:https://crunchydata.github.io/crunchy-containers/stable/examples/[the Examples documentation] for running in Docker, Kubernetes, and OpenShift environments.

You will need to set up your environment as per the link:https://crunchydata.github.io/crunchy-containers/stable/installation/[Installation documentation] in order to
You will need to set up your environment as per the link:https://crunchydata.github.io/crunchy-containers/stable/installation-guide/[Installation documentation] in order to
execute the examples.
5 changes: 4 additions & 1 deletion badger/badgerserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package main

import (
"bytes"
"fmt"
"log"
"net/http"
"os"
Expand Down Expand Up @@ -49,7 +50,9 @@ func BadgerGenerate(w http.ResponseWriter, r *http.Request) {
cmd.Stderr = &stderr
err := cmd.Run()
if err != nil {
log.Fatalf("Error running badger-generate: %s", err)
errorMsg := fmt.Sprintf("Error running badger-generate: %s\n%s", err, stderr.String())
log.Println(errorMsg)
http.Error(w, errorMsg, http.StatusInternalServerError)
return
}

Expand Down
Loading

0 comments on commit b7ce49a

Please sign in to comment.