fix merge conflict

auguwu · Jan 31, 2023 · ff5973c · ff5973c
2 parents 4fdda37 + 25c75f9
commit ff5973c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
@@ -35,7 +35,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update && \
   apt upgrade -y && \
   apt install -y sudo git curl neofetch git-lfs ca-certificates \
-                unzip zip bash vim nano python3 python3-pip libarchive-tools gnupg lsb-release
+                unzip zip bash vim nano python3 python3-pip libarchive-tools gnupg lsb-release pkg-config \
+                libssl-dev
 
 # Setup the user environment
 RUN groupadd -g ${USER_GID} ${USERNAME} && \

diff --git a/images/base/README.md b/images/base/README.md
@@ -1,5 +1,5 @@
 # ghcr.io/auguwu/coder-images/base:latest
-This image is the main base for all of the images in this repository. It uses the **Arch Linux** distribution since I am most comfortable in that distribution, I might provide Debian and Ubuntu variants, if other people use this!
+This image is the main base for all of the images in this repository.
 
 ## Bundled Software
 | Name        | Description                                                                       | Version               |

diff --git a/template/.terraform.lock.hcl b/template/.terraform.lock.hcl
diff --git a/template/main.tf b/template/main.tf
@@ -23,7 +23,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.6.9"
+      version = "0.6.10"
     }
 
     docker = {