Skip to content

Commit

Permalink
preping for release
Browse files Browse the repository at this point in the history
  • Loading branch information
adamjohnwright committed May 25, 2019
1 parent 8d7d150 commit 6be2166
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [0.9.7] - 2018-05-25
- Fixing bugs

## [0.9.6] - 2018-05-20
- fixing handling of multiple 5 prime and/or 3 prime utr on transcripts and cds sequence pages

Expand Down
2 changes: 1 addition & 1 deletion Dockerrun.aws.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"AWSEBDockerrunVersion": 1,
"Image": {
"Name": "357210185381.dkr.ecr.us-east-1.amazonaws.com/wormbase/rest:0.9.6",
"Name": "357210185381.dkr.ecr.us-east-1.amazonaws.com/wormbase/rest:0.9.7",
"Update": "true"
},
"Ports": [
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NAME := wormbase/rest
VERSION ?= "0.9.6"
WORMBASE_REST_VERSION ?= "0.9.7"
EBX_CONFIG := .ebextensions/.config
WB_DB_URI ?= $(shell sed -rn 's|value:(.*)|\1|p' \
${EBX_CONFIG} | tr -d " " | head -n 1)
Expand All @@ -8,7 +8,7 @@ LOWER_WS_VERSION ?= $(shell echo ${WS_VERSION} | tr A-Z a-z)
DEPLOY_JAR := app.jar
PORT := 3000
WB_ACC_NUM := 357210185381
FQ_TAG := ${WB_ACC_NUM}.dkr.ecr.us-east-1.amazonaws.com/${NAME}:${VERSION}
FQ_TAG := ${WB_ACC_NUM}.dkr.ecr.us-east-1.amazonaws.com/${NAME}:${WORMBASE_REST_VERSION}
FQ_TAG_LATEST := ${WB_ACC_NUM}.dkr.ecr.us-east-1.amazonaws.com/${NAME}:latest
WB_FTP_URL := ftp://ftp.wormbase.org/pub/wormbase/releases/${WS_VERSION}

Expand Down Expand Up @@ -39,8 +39,8 @@ docker-ecr-login: $(call print-help,docker-ecr-login,"Login to ECR")
docker-tag: $(call print-help,docker-tag,\
"Tag the image with current git revision \
and ':latest' alias")
@docker tag ${NAME}:${VERSION} ${FQ_TAG}
@docker tag ${NAME}:${VERSION} \
@docker tag ${NAME}:${WORMBASE_REST_VERSION} ${FQ_TAG}
@docker tag ${NAME}:${WORMBASE_REST_VERSION} \
${WB_ACC_NUM}.dkr.ecr.us-east-1.amazonaws.com/${NAME}


Expand Down Expand Up @@ -100,7 +100,7 @@ eb-local: docker-ecr-login $(call print-help,eb-local,\
build: docker/${DEPLOY_JAR} \
$(call print-help,build,\
"Build the docker images from using the current git revision.")
@docker build -t ${NAME}:${VERSION} \
@docker build -t ${NAME}:${WORMBASE_REST_VERSION} \
--build-arg uberjar_path=${DEPLOY_JAR} \
--build-arg \
aws_secret_access_key=${AWS_SECRET_ACCESS_KEY} \
Expand Down Expand Up @@ -132,7 +132,7 @@ run: $(call print-help,run,"Run the application in docker (locally).")
-e AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
-e WB_DB_URI=${WB_DB_URI} \
-e PORT=${PORT} \
${NAME}:${VERSION}
${NAME}:${WORMBASE_REST_VERSION}

.PHONY: run-latest
run-latest: $(call print-help,run,"Run the application in docker (locally).")
Expand Down
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject wormbase/rest-api "0.9.6"
(defproject wormbase/rest-api "0.9.7"
:description
"REST API for retrieving data from datomic on a per widget basis"
:url "https://github.com/WormBase/wormbase-rest"
Expand Down

0 comments on commit 6be2166

Please sign in to comment.