Merge cef4a53 into b1e8680

weldr · Feb 27, 2018 · 107cf8f · 107cf8f
2 parents b1e8680 + cef4a53
commit 107cf8f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 welder-deployment/
 *.tix
 *.pyc
+rpms/
diff --git a/Makefile b/Makefile
@@ -7,9 +7,9 @@ endif
 STORE ?= cs.repo
 MDDB ?= metadata.db
 
-weld-f25:
+weld-fedora:
 	git clone https://github.com/weldr/welder-deployment
-	$(MAKE) -C welder-deployment weld-f25
+	$(MAKE) -C welder-deployment weld-fedora
 	-rm -rf ./welder-deployment
 
 build-and-test: Dockerfile.build

diff --git a/README.md b/README.md
@@ -35,9 +35,9 @@ and Dockerfile.  Dockerfile.build is used to compile the program needed to
 build an mddb and produces an image with that program.  Dockerfile then runs
 that image and produces the mddb.
 
-The Dockerfile depends on a base image, named weld/fedora:25, which needs have
+The Dockerfile depends on a base image, named welder/fedora:latest, which needs have
 been previously built. If it is not available it can be built from the
-welder-deployment repository by running `make weld-f25`.
+welder-deployment repository by running `make weld-fedora`.
 
 The Makefile lays out the exact steps and can be used to simplify all this -
 just run `make importer mddb`.  If make is unavailable, just copy the steps