Skip to content
This repository has been archived by the owner on Apr 28, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: EBISPOT/OLS
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dev
Choose a base ref
...
head repository: IHCC-cohorts/OLS
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 7 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 17, 2020

  1. Create docker.Makefile

    @matentzn
    matentzn committed Aug 17, 2020
    Copy the full SHA
    b80a278 View commit details

Commits on Aug 26, 2020

  1. Merge pull request #1 from EBISPOT/master 

    Adding upstream changes
    @matentzn
    matentzn authored Aug 26, 2020
    Copy the full SHA
    56e2ced View commit details

  2. Update docker.Makefile

    @matentzn
    matentzn committed Aug 26, 2020
    Copy the full SHA
    38eb638 View commit details

  3. Merge branch 'master' of https://github.com/IHCC-cohorts/OLS

    @matentzn
    matentzn committed Aug 26, 2020
    Copy the full SHA
    dd43190 View commit details

Commits on Aug 27, 2020

  1. Merge pull request #2 from EBISPOT/master 

    Merge changes
    @matentzn
    matentzn authored Aug 27, 2020
    Copy the full SHA
    422100b View commit details

Commits on Feb 22, 2021

  1. Merge pull request #3 from EBISPOT/master 

    Updateing master from EBISPOT OLS
    @matentzn
    matentzn authored Feb 22, 2021
    Copy the full SHA
    7fbb832 View commit details

Commits on Feb 23, 2021

  1. Merge pull request #4 from EBISPOT/master 

    Update master from EBISPOT
    @matentzn
    matentzn authored Feb 23, 2021
    Copy the full SHA
    984f72f View commit details
Showing with 30 additions and 0 deletions.
  1. +30 −0 docker.Makefile
30 changes: 30 additions & 0 deletions docker.Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

# Building docker image
VERSION = "0.0.1"
PRODUCT=ols-web
IM=ihcc/$(PRODUCT)

docker-build-no-cache:
@docker build --no-cache -t $(IM):$(VERSION) -f ./$(PRODUCT)/Dockerfile . \
&& docker tag $(IM):$(VERSION) $(IM):latest

docker-build:
@docker build -t $(IM):$(VERSION) -f ./$(PRODUCT)/Dockerfile . \
&& docker tag $(IM):$(VERSION) $(IM):latest

docker-run: docker-build
docker run -p 8080:90 $(IM)

docker-clean:
docker kill $(IM) || echo not running ;
docker rm $(IM) || echo not made

docker-publish-no-build:
@docker push $(IM):$(VERSION) \
&& docker push $(IM):latest

docker-publish: docker-build
@docker push $(IM):$(VERSION) \
&& docker push $(IM):latest

#include dumps.Makefile