Release 4.8

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2
 
-.tempates:
-  .validate_template: &validate_template
+jobs:
+  validate:
     docker:
       -
         image: finalgene/hadolint:latest
@@ -13,8 +13,9 @@ version: 2
         run:
           name: Validate Dockerfile
           command: |
-            hadolint $VERSION/Dockerfile
-  .build_template: &build_template
+            hadolint Dockerfile
+
+  build:
     docker:
       -
         image: docker:18.05.0-ce-git
@@ -26,28 +27,18 @@ version: 2
         run:
           name: Build application Docker image
           command: |
-            docker build --tag lftp:$VERSION $VERSION/
+            docker build .
       -
         run:
           name: List created images
           command: |
             docker images
 
-jobs:
-  validate-4.8:
-    environment:
-      VERSION: "4.8"
-    <<: *validate_template
-  build-4.8:
-    environment:
-      VERSION: "4.8"
-    <<: *build_template
-
 workflows:
   version: 2
   validate_and_build:
     jobs:
-      - validate-4.8
-      - build-4.8:
+      - validate
+      - build:
           requires:
-            - validate-4.8
+            - validate

4.8/Dockerfile → Dockerfile

@@ -4,7 +4,7 @@ LABEL maintainer="[email protected]"
 
 ENV LFTP_VERSION 4.8.3-r2
 
-RUN apk add --no-cache --virtual=.build-deps bash
+RUN apk add --no-cache bash
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
@@ -23,8 +23,6 @@ RUN { \
     echo 'set ssl:verify-certificate no'; \
 } | tee /root/.lftprc
 
-RUN apk del .build-deps
-
 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 
 WORKDIR /app

Makefile

@@ -1,29 +1,24 @@
 NAME = lftp
 
-VERSIONS = 4.8
-
-.PHONY: build
-build: ${VERSIONS}
-
-.PHONY: ${VERSIONS}
-${VERSIONS}:
-	@echo "Build ${@}"
-
+.PHONY: lint
+lint:
 	@docker run \
 		--rm \
 		--volume "$(shell pwd)":/app \
 		finalgene/hadolint \
-		${@}/Dockerfile
+		Dockerfile
 
+.PHONY: build
+build: lint
 	@docker build \
 		--no-cache \
-		--tag finalgene/${NAME}:${@}-dev \
-		${@}/
+		--tag finalgene/${NAME}:dev \
+		.
 
-	@docker images finalgene/${NAME}:${@}-dev
+	@docker images finalgene/${NAME}:dev
 
 .PHONY: clean
 clean:
 	-@docker rmi \
 		--force \
-		$(shell docker images finalgene/${NAME}:*-dev -q)
+		$(shell docker images finalgene/${NAME}:dev -q)

README.md

@@ -4,9 +4,6 @@
 This is a image to run the [lftp client](https://lftp.yar.ru).
 Based on the idea from [Sebastian Mellor](https://github.com/sebble/docker-images) => [Light-weight deployment environment](https://github.com/sebble/docker-images/tree/master/deploy)
 
-## Supported tags and respective Dockerfile links
-* `4.8`, `latest` [(4.8/Dockerfile)](https://github.com/finalgene/docker-hub-lftp/blob/master/4.8/Dockerfile)
-
 ## How to use this image
 Run the `lftp` image: