Simplify local development targets and Dockerfile

Signed-off-by: Juan Cruz Viotti <[email protected]>

Author: jviotti

Dockerfile

@@ -9,7 +9,11 @@ RUN apt-get --yes update && apt-get install --yes --no-install-recommends make n
 COPY configuration.json /app/configuration.json
 COPY vendor /app/vendor
 COPY Makefile /app/Makefile
-RUN make -C /app prepare index REGISTRY=/usr/bin OUTPUT=/app/index
+RUN make -C /app prepare
+RUN ldd /usr/bin/sourcemeta-registry-index
+RUN ldd /usr/bin/sourcemeta-registry-server
+ENV SOURCEMETA_REGISTRY_I_HAVE_A_COMMERCIAL_LICENSE 1
+RUN /usr/bin/sourcemeta-registry-index /app/configuration.json /app/index
 
 FROM scratch
 COPY --from=builder /usr/bin/sourcemeta-registry-server \

Makefile

@@ -8,15 +8,12 @@ REGISTRY ?= ../registry/build/dist/bin
 BUILD ?= ./build
 OUTPUT ?= $(BUILD)/registry
 
-ifeq ($(shell uname), Darwin)
-LDD ?= otool -L
-else
-LDD ?= ldd
-endif
-
 .PHONY: all
-all: prepare index
-	$(REGISTRY)/sourcemeta-registry-server $(OUTPUT)
+all: configuration.json prepare
+	SOURCEMETA_REGISTRY_I_HAVE_A_COMMERCIAL_LICENSE=1 \
+		$(REGISTRY)/sourcemeta-registry-index $< $(OUTPUT)
+	SOURCEMETA_REGISTRY_I_HAVE_A_COMMERCIAL_LICENSE=1 \
+		$(REGISTRY)/sourcemeta-registry-server $(OUTPUT)
 
 define geojson_prepare
 $(BUILD)/geojson-$(1)/%.json: vendor/geojson-$(1)/bin/format.js vendor/geojson-$(1)/src/schema/%.js
@@ -38,13 +35,6 @@ prepare: \
 	$(patsubst vendor/geojson-1-0-2/src/schema/%.js,$(BUILD)/geojson-1-0-2/%.json,$(wildcard vendor/geojson-1-0-2/src/schema/*.js)) \
 	$(patsubst vendor/geojson-1-0-1/src/schema/%.js,$(BUILD)/geojson-1-0-1/%.json,$(wildcard vendor/geojson-1-0-1/src/schema/*.js)) \
 	$(patsubst vendor/geojson-1-0-0/src/schema/%.js,$(BUILD)/geojson-1-0-0/%.json,$(wildcard vendor/geojson-1-0-0/src/schema/*.js))
-	$(LDD) $(REGISTRY)/sourcemeta-registry-index
-	$(LDD) $(REGISTRY)/sourcemeta-registry-server
-
-.PHONY: index
-index: configuration.json
-	SOURCEMETA_REGISTRY_I_HAVE_A_COMMERCIAL_LICENSE=1 \
-		$(REGISTRY)/sourcemeta-registry-index $< $(OUTPUT)
 
 .PHONY: clean
 clean: