这是indexloc提供的服务，不要输入任何密码
Skip to content

read version from env var during server build time (close #1398) #1897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 11, 2019
Merged

read version from env var during server build time (close #1398) #1897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ff42ee3
read version from env var at build time (close #1398)
shahidhk Mar 28, 2019
6f08de2
remove un-used imports, edit makefile
shahidhk Mar 28, 2019
98918ef
Merge branch 'master' into version-from-env
shahidhk Mar 28, 2019
407cdbc
edit makefile to add new targets and export variables
shahidhk Mar 28, 2019
22144d7
Merge branch 'version-from-env' of github.com:shahidhk/graphql-engine…
shahidhk Mar 28, 2019
4eb0543
only export VERSION in makefile
shahidhk Mar 28, 2019
b4414e0
Merge branch 'master' into version-from-env
0x777 Apr 5, 2019
a4dbd1a
Merge branch 'master' into version-from-env
shahidhk Apr 8, 2019
351427a
read version by executing the script if env var is absent
shahidhk Apr 8, 2019
60fdcf9
Merge branch 'version-from-env' of github.com:shahidhk/graphql-engine…
shahidhk Apr 8, 2019
ae0a6a4
Merge branch 'master' into version-from-env
0x777 Apr 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions server/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
project := graphql-engine
registry := hasura
version := $(shell ../scripts/get-version.sh)
VERSION ?= $(shell ../scripts/get-version.sh)
export VERSION
nproc := $(shell nproc)

# TODO: needs to be replaced with something like yq
stack_resolver := $(shell awk '/^resolver:/ {print $$2;}' stack.yaml)
Expand All @@ -10,12 +12,20 @@ build_dir := $(project_dir)/$(shell stack path --dist-dir)/build

build_output := /build/_server_output

dev: src-lib src-exec src-rsr
stack build --fast
stack exec graphql-engine -- --database-url postgres://postgres:@localhost:5432/hge serve --enable-console
build:
stack build --fast --ghc-options '-j$(nproc)'

build-local-console:
stack build --fast --flag graphql-engine:local-console --ghc-options '-j$(nproc)'

exec: build
stack exec graphql-engine -- serve

exec-local-console: build-local-console
stack exec graphql-engine -- serve --enable-console

image: $(project).cabal
docker build -t "$(registry)/$(project):$(version)" \
docker build -t "$(registry)/$(project):$(VERSION)" \
-f packaging/Dockerfile \
--build-arg build_flags=--fast \
--build-arg project=$(project) \
Expand All @@ -24,7 +34,7 @@ image: $(project).cabal
.

release-image: $(project).cabal
docker build -t "$(registry)/$(project):$(version)" \
docker build -t "$(registry)/$(project):$(VERSION)" \
-f packaging/Dockerfile \
--build-arg project=$(project) \
--build-arg stack_resolver=$(stack_resolver) \
Expand All @@ -38,7 +48,7 @@ ci-binary:
mkdir -p $(build_output)
cp $(build_dir)/$(project)/$(project) $(build_output)
# cp "$(build_dir)/$(project)-test/$(project)-test" $(build_output)
echo "$(version)" > $(build_output)/version.txt
echo "$(VERSION)" > $(build_output)/version.txt

ci-test:
$(build_output)/graphql-engine-test --database-url=$(DATABASE_URL)
Expand All @@ -50,22 +60,22 @@ ci-image:
docker run --rm --volumes-from dummy $(registry)/graphql-engine-packager:$(packager_ver) /build.sh $(project) | tar -x -C packaging/build/rootfs
strip --strip-unneeded packaging/build/rootfs/bin/$(project)
upx packaging/build/rootfs/bin/$(project)
docker build -t $(registry)/$(project):$(version) packaging/build/
docker build -t $(registry)/$(project):$(VERSION) packaging/build/

ci-save-image:
docker save -o $(build_output)/image.tar $(registry)/$(project):$(version)
docker save -o $(build_output)/image.tar $(registry)/$(project):$(VERSION)

ci-load-image:
docker load -i $(build_output)/image.tar

push:
docker push $(registry)/$(project):$(version)
docker push $(registry)/$(project):$(VERSION)

push-latest:
docker tag $(registry)/$(project):$(version) $(registry)/$(project):latest
docker tag $(registry)/$(project):$(VERSION) $(registry)/$(project):latest
docker push $(registry)/$(project):latest

packager: packaging/packager.df
docker build -t "$(registry)/graphql-engine-packager:$(packager_ver)" -f packaging/packager.df ./packaging/

.PHONY: image release-image push packager ci-binary-and-test ci-image ci-save-image ci-load-image
.PHONY: image release-image push packager ci-binary-and-test ci-image ci-save-image ci-load-image build exec build-local-console exec-local-console
11 changes: 10 additions & 1 deletion server/src-lib/Hasura/Server/Utils.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import qualified Database.PG.Query.Connection as Q
import Data.Aeson
import Data.List.Split
import Network.URI
import System.Environment
import System.Exit
import System.Process

Expand Down Expand Up @@ -76,7 +77,15 @@ uriAuthParameters uriAuth = port . host . auth
[u, p] -> \info -> info { Q.connUser = unEscapeString u, Q.connPassword = unEscapeString $ dropLast p }
_ -> id

-- Running shell script during compile time
-- Get an env var during compile time
getValFromEnvOrScript :: String -> String -> TH.Q TH.Exp
getValFromEnvOrScript n s = do
maybeVal <- TH.runIO $ lookupEnv n
case maybeVal of
Just val -> TH.lift val
Nothing -> runScript s

-- Run a shell script during compile time
runScript :: FilePath -> TH.Q TH.Exp
runScript fp = do
TH.addDependentFile fp
Expand Down
4 changes: 2 additions & 2 deletions server/src-lib/Hasura/Server/Version.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import qualified Data.SemVer as V
import qualified Data.Text as T

import Hasura.Prelude
import Hasura.Server.Utils (runScript)
import Hasura.Server.Utils (getValFromEnvOrScript)

version :: T.Text
version = T.dropWhileEnd (== '\n') $(runScript "../scripts/get-version.sh")
version = T.dropWhileEnd (== '\n') $(getValFromEnvOrScript "VERSION" "../scripts/get-version.sh")

consoleVersion :: T.Text
consoleVersion = case V.fromText $ T.dropWhile (== 'v') version of
Expand Down