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

Fix config image name #4989

Merged
merged 1 commit into from
Jun 7, 2019
Merged

Fix config image name #4989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ docker-build-build: $(shell docker-required --path . --replace-pattern='^test(.*

.PHONY: docker-build-config
docker-build-config:
docker build --tag=$(DOCKER_BASE)-config:$(MAJOR_VERSION) docker/config
docker build --tag=$(DOCKER_BASE)-config-build:$(MAJOR_VERSION) docker/config

docker/qgisserver/commons: commons
rm --recursive --force $@
Expand Down
2 changes: 1 addition & 1 deletion geoportal/c2cgeoportal_geoportal/scaffolds/create/Dockerfile.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM camptocamp/geomapfish-build:${geomapfish_version}
FROM camptocamp/geomapfish-config-build:${geomapfish_version}

COPY . /tmp/config/

Expand Down
2 changes: 1 addition & 1 deletion travis/publish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ then
fi

# Publish the GeoMapFish images
for IMAGE in geomapfish-build-dev geomapfish-build geomapfish-config
for IMAGE in geomapfish-build-dev geomapfish-build geomapfish-config-build
do
docker tag camptocamp/${IMAGE}:${MAJOR_VERSION} camptocamp/${IMAGE}:${VERSION}
docker push camptocamp/${IMAGE}:${VERSION}
Expand Down