Skip to content
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

Jump to bottom

build(standalone): Add DGRAPH_VERSION to build different Dgraph versions for standalone image. #6082

Merged
merged 6 commits into from
Jul 28, 2020
Merged

build(standalone): Add DGRAPH_VERSION to build different Dgraph versions for standalone image. #6082

merged 6 commits into from
Jul 28, 2020

Conversation

danielmai
Copy link
Contributor

@danielmai danielmai commented Jul 27, 2020 •
edited by manishrjain
Loading 

# Usage:
#  Build latest tag, based on dgraph/dgraph:latest
#    make
#
#  Build $TAG tag, based on dgraph/dgraph:$TAG
#    make DGRAPH_VERSION=$TAG
#
# Examples
#  Build master:
#    make DGRAPH_VERSION=master

The standalone images build from the same tags as the dgraph/dgraph image.

To build and push the v20.03.4 and latest dgraph/standalone images:

# Build v20.03.4
make DGRAPH_VERSION=v20.03.4
make DGRAPH_VERSION=v20.03.4 push
# Build latest. DGRAPH_VERSION defaults to latest
make
make push

Changes

  • Add DOCKER_IMAGE and DGRAPH_VERSION arguments to build standalone Docker image.
  • Add ./hooks folder for Docker Hub auto-builds with --build-args (following Custom build phase hooks docs).

This change is Reviewable

@github-actions github-actions bot added the area/integrations Related to integrations with other projects. label Jul 27, 2020
parasssh
parasssh approved these changes Jul 27, 2020
View reviewed changes
Copy link
Contributor

@parasssh parasssh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor comments. Feel free to resolve.

contrib/standalone/Makefile Outdated
#
# Examples
# Build master:
# make DGRAPH_VERSION=master
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might want to complete the example with another step to make push

contrib/standalone/Makefile Outdated
# make DGRAPH_VERSION=master
.PHONY: all build push version

export DOCKER_IMAGE ?= dgraph/standalone
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We dont envision any other value for DOCKER_IMAGE, so may be hard code it?

danielmai
danielmai commented Jul 27, 2020
View reviewed changes
Copy link
Contributor Author

@danielmai danielmai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 0 of 4 files reviewed, 2 unresolved discussions (waiting on @manishrjain, @parasssh, and @vvbalaji-dgraph)

contrib/standalone/Makefile, line 11 at r1 (raw file):

Previously, parasssh wrote…

Might want to complete the example with another step to make push

Added an example for push.

contrib/standalone/Makefile, line 14 at r1 (raw file):

Previously, parasssh wrote…

We dont envision any other value for DOCKER_IMAGE, so may be hard code it?

Good point. I added a variable to do local testing with a different image repo.

Now it's set to dgraph/standalone always.

@danielmai danielmai merged commit bcd1684 into master Jul 28, 2020
@danielmai danielmai deleted the danielmai/standalone-makefile branch July 28, 2020 20:14
danielmai added a commit that referenced this pull request Jul 31, 2020
@danielmai
build(standalone): Add DGRAPH_VERSION to build different Dgraph versi…
66fc825 
…ons for standalone image. (#6082)

The standalone images build from the same tags as the `dgraph/dgraph` image.

To build and push the v20.03.4 and latest `dgraph/standalone` images:

    # Build v20.03.4
    make DGRAPH_VERSION=v20.03.4
    make DGRAPH_VERSION=v20.03.4 push

    # Build latest. DGRAPH_VERSION defaults to latest
    make
    make push

Changes
* Add `DOCKER_IMAGE` and `DGRAPH_VERSION` arguments to build standalone Docker image.
* Add ./hooks folder for Docker Hub auto-builds with `--build-arg`s (following [Custom build phase hooks](https://docs.docker.com/docker-hub/builds/advanced/#custom-build-phase-hooks) docs).
@danielmai danielmai mentioned this pull request Jul 31, 2020
Merged
parasssh pushed a commit that referenced this pull request Jul 31, 2020
@danielmai
build(standalone): Add DGRAPH_VERSION to build different Dgraph versi…
ab132ba 
…ons for standalone image. (#6082) (#6122)

The standalone images build from the same tags as the `dgraph/dgraph` image.

To build and push the v20.03.4 and latest `dgraph/standalone` images:

    # Build v20.03.4
    make DGRAPH_VERSION=v20.03.4
    make DGRAPH_VERSION=v20.03.4 push

    # Build latest. DGRAPH_VERSION defaults to latest
    make
    make push

Changes
* Add `DOCKER_IMAGE` and `DGRAPH_VERSION` arguments to build standalone Docker image.
* Add ./hooks folder for Docker Hub auto-builds with `--build-arg`s (following [Custom build phase hooks](https://docs.docker.com/docker-hub/builds/advanced/#custom-build-phase-hooks) docs).
danielmai added a commit that referenced this pull request Aug 18, 2020
@danielmai
build(standalone): Add DGRAPH_VERSION to build different Dgraph versi…
e43393e 
…ons for standalone image. (#6082)

The standalone images build from the same tags as the `dgraph/dgraph` image.

To build and push the v20.03.4 and latest `dgraph/standalone` images:

    # Build v20.03.4
    make DGRAPH_VERSION=v20.03.4
    make DGRAPH_VERSION=v20.03.4 push

    # Build latest. DGRAPH_VERSION defaults to latest
    make
    make push

Changes
* Add `DOCKER_IMAGE` and `DGRAPH_VERSION` arguments to build standalone Docker image.
* Add ./hooks folder for Docker Hub auto-builds with `--build-arg`s (following [Custom build phase hooks](https://docs.docker.com/docker-hub/builds/advanced/#custom-build-phase-hooks) docs).
danielmai added a commit that referenced this pull request Aug 18, 2020
@danielmai
build(standalone): Add DGRAPH_VERSION to build different Dgraph versi…
bf374eb 
…ons for standalone image. (#6082)

The standalone images build from the same tags as the `dgraph/dgraph` image.

To build and push the v20.03.4 and latest `dgraph/standalone` images:

    # Build v20.03.4
    make DGRAPH_VERSION=v20.03.4
    make DGRAPH_VERSION=v20.03.4 push

    # Build latest. DGRAPH_VERSION defaults to latest
    make
    make push

Changes
* Add `DOCKER_IMAGE` and `DGRAPH_VERSION` arguments to build standalone Docker image.
* Add ./hooks folder for Docker Hub auto-builds with `--build-arg`s (following [Custom build phase hooks](https://docs.docker.com/docker-hub/builds/advanced/#custom-build-phase-hooks) docs).
@danielmai danielmai mentioned this pull request Aug 18, 2020
Merged
parasssh pushed a commit that referenced this pull request Aug 18, 2020
@danielmai
build(standalone): Add DGRAPH_VERSION to build different Dgraph versi…
8e9ce7d 
…ons for standalone image. (#6082) (#6237)

The standalone images build from the same tags as the `dgraph/dgraph` image.

To build and push the v20.03.4 and latest `dgraph/standalone` images:

    # Build v20.03.4
    make DGRAPH_VERSION=v20.03.4
    make DGRAPH_VERSION=v20.03.4 push

    # Build latest. DGRAPH_VERSION defaults to latest
    make
    make push

Changes
* Add `DOCKER_IMAGE` and `DGRAPH_VERSION` arguments to build standalone Docker image.
* Add ./hooks folder for Docker Hub auto-builds with `--build-arg`s (following [Custom build phase hooks](https://docs.docker.com/docker-hub/builds/advanced/#custom-build-phase-hooks) docs).
@danielmai danielmai mentioned this pull request Aug 18, 2020
Merged
parasssh pushed a commit that referenced this pull request Aug 18, 2020
@danielmai
build(standalone): Add DGRAPH_VERSION to build different Dgraph versi…
fdc484b 
…ons for standalone image. (#6082) (#6238)

The standalone images build from the same tags as the `dgraph/dgraph` image.

To build and push the v20.03.4 and latest `dgraph/standalone` images:

    # Build v20.03.4
    make DGRAPH_VERSION=v20.03.4
    make DGRAPH_VERSION=v20.03.4 push

    # Build latest. DGRAPH_VERSION defaults to latest
    make
    make push

Changes
* Add `DOCKER_IMAGE` and `DGRAPH_VERSION` arguments to build standalone Docker image.
* Add ./hooks folder for Docker Hub auto-builds with `--build-arg`s (following [Custom build phase hooks](https://docs.docker.com/docker-hub/builds/advanced/#custom-build-phase-hooks) docs).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@parasssh parasssh parasssh approved these changes

@manishrjain manishrjain Awaiting requested review from manishrjain

@vvbalaji-dgraph vvbalaji-dgraph Awaiting requested review from vvbalaji-dgraph

Assignees
No one assigned
Labels
area/integrations Related to integrations with other projects.
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@danielmai @parasssh