Adding make shell command and removing make tag-date command.
This commit is contained in:
parent
e01fdee37f
commit
0112785c5b
1 changed files with 9 additions and 11 deletions
20
Makefile
20
Makefile
|
|
@ -3,8 +3,7 @@ IMAGE_NAME := greenmatthew/scp-secret-laboratory-server
|
||||||
VERSION := 1.0.0
|
VERSION := 1.0.0
|
||||||
CONTAINER_NAME := scp-sl-server
|
CONTAINER_NAME := scp-sl-server
|
||||||
PORT := 7777
|
PORT := 7777
|
||||||
|
SHELL := /bin/sh
|
||||||
# Set this to your Docker Hub username before pushing
|
|
||||||
DOCKER_USERNAME ?= greenmatthew
|
DOCKER_USERNAME ?= greenmatthew
|
||||||
|
|
||||||
# Default goal
|
# Default goal
|
||||||
|
|
@ -28,6 +27,12 @@ run:
|
||||||
--restart unless-stopped \
|
--restart unless-stopped \
|
||||||
$(IMAGE_NAME):latest
|
$(IMAGE_NAME):latest
|
||||||
|
|
||||||
|
# Get a shell inside the container
|
||||||
|
.PHONY: shell
|
||||||
|
shell:
|
||||||
|
@echo "Executing shell in container: $(CONTAINER_NAME)"
|
||||||
|
docker exec -it $(CONTAINER_NAME) $(SHELL)
|
||||||
|
|
||||||
# Stop the container
|
# Stop the container
|
||||||
.PHONY: stop
|
.PHONY: stop
|
||||||
stop:
|
stop:
|
||||||
|
|
@ -46,14 +51,6 @@ push:
|
||||||
docker push $(IMAGE_NAME):$(VERSION)
|
docker push $(IMAGE_NAME):$(VERSION)
|
||||||
docker push $(IMAGE_NAME):latest
|
docker push $(IMAGE_NAME):latest
|
||||||
|
|
||||||
# Tag and push with current date
|
|
||||||
.PHONY: tag-date
|
|
||||||
tag-date:
|
|
||||||
$(eval DATE := $(shell date +%Y%m%d))
|
|
||||||
@echo "Tagging with date: $(IMAGE_NAME):$(DATE)"
|
|
||||||
docker tag $(IMAGE_NAME):latest $(IMAGE_NAME):$(DATE)
|
|
||||||
docker push $(IMAGE_NAME):$(DATE)
|
|
||||||
|
|
||||||
# Login to Docker Hub
|
# Login to Docker Hub
|
||||||
.PHONY: login
|
.PHONY: login
|
||||||
login:
|
login:
|
||||||
|
|
@ -74,10 +71,10 @@ help:
|
||||||
@echo " all (default) - Build the Docker image"
|
@echo " all (default) - Build the Docker image"
|
||||||
@echo " build - Build the Docker image"
|
@echo " build - Build the Docker image"
|
||||||
@echo " run - Run the container"
|
@echo " run - Run the container"
|
||||||
|
@echo " shell - Get a shell inside the running container"
|
||||||
@echo " stop - Stop and remove the container"
|
@echo " stop - Stop and remove the container"
|
||||||
@echo " restart - Restart the container"
|
@echo " restart - Restart the container"
|
||||||
@echo " push - Push the image to Docker Hub"
|
@echo " push - Push the image to Docker Hub"
|
||||||
@echo " tag-date - Tag and push image with current date"
|
|
||||||
@echo " login - Login to Docker Hub"
|
@echo " login - Login to Docker Hub"
|
||||||
@echo " clean - Stop container and remove images"
|
@echo " clean - Stop container and remove images"
|
||||||
@echo " logs - View container logs"
|
@echo " logs - View container logs"
|
||||||
|
|
@ -88,6 +85,7 @@ help:
|
||||||
@echo " VERSION = $(VERSION)"
|
@echo " VERSION = $(VERSION)"
|
||||||
@echo " CONTAINER_NAME = $(CONTAINER_NAME)"
|
@echo " CONTAINER_NAME = $(CONTAINER_NAME)"
|
||||||
@echo " PORT = $(PORT)"
|
@echo " PORT = $(PORT)"
|
||||||
|
@echo " SHELL = $(SHELL)"
|
||||||
@echo " DOCKER_USERNAME = $(DOCKER_USERNAME)"
|
@echo " DOCKER_USERNAME = $(DOCKER_USERNAME)"
|
||||||
|
|
||||||
# View container logs
|
# View container logs
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue