diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index b9f3f70..11cba43 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM nicbet/phoenix:1.6.13 +FROM nicbet/phoenix:1.6.14 RUN apt-get install -y ruby \ && gem install --no-document htmlbeautifier -v 1.3.1 \ diff --git a/Dockerfile b/Dockerfile index 5ba3759..0b68489 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,11 @@ -FROM elixir:1.14.0 +FROM elixir:1.14.1 # Build Args -ARG PHOENIX_VERSION=1.6.13 +ARG PHOENIX_VERSION=1.6.14 ARG NODEJS_VERSION=18.x # Apt -RUN apt-get update && apt-get upgrade -y -RUN apt-get install -y apt-utils -RUN apt-get install -y build-essential -RUN apt-get install -y inotify-tools +RUN apt-get update && apt-get upgrade -y && apt-get install -y apt-utils build-essential inotify-tools # Nodejs RUN curl -sL https://deb.nodesource.com/setup_${NODEJS_VERSION} | bash diff --git a/Makefile b/Makefile index 638e91a..322f43e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ OWNER = nicbet IMAGE = phoenix TAG = $(OWNER)/$(IMAGE) -VERSION = 1.6.13 +VERSION = 1.6.14 all: test @@ -11,7 +11,7 @@ all: test # Build the docker image docker-image: Dockerfile $(info Building image with tag $(TAG):$(VERSION)) - @docker build -t $(TAG):$(VERSION) --no-cache . + @docker build --no-cache -t $(TAG):$(VERSION) . # Fetch the image from docker.io (requires `docker login` for private repositories) pull: diff --git a/README.md b/README.md index fced986..3ae39b8 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,11 @@ Maybe you are working on multiple different projects, built with different versi To initialize a new development environment, clone this repository. You can specify a version tag to target a particular Phoenix framework version. We automatically pin the Elixir version of each release to the version of Elixir that was available at the time of the specific Phoenix framework release. -For instance, to set up a dockerized development environment for a project called `hello-phoenix` using Phoenix framework version `1.6.13` you would run: +For instance, to set up a dockerized development environment for a project called `hello-phoenix` using Phoenix framework version `1.6.14` you would run: ```sh # Clone this repository into a new project folder -git clone -b 1.6.13 https://github.com/nicbet/docker-phoenix ~/Projects/hello-phoenix +git clone -b 1.6.14 https://github.com/nicbet/docker-phoenix ~/Projects/hello-phoenix # Go to the new project folder cd ~/Projects/hello-phoenix diff --git a/docker-compose.yml b/docker-compose.yml index f4905ec..59849ad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "2" services: app: - image: nicbet/phoenix:1.6.13 + image: nicbet/phoenix:1.6.14 build: . ports: - "4000:4000"