Skip to content

Commit

Permalink
Fix terraform error installing bash
Browse files Browse the repository at this point in the history
  • Loading branch information
containerscrew committed Aug 15, 2024
1 parent 334b230 commit a734309
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@ jobs:
steps:
- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_AUTH_USERNAME }}
password: ${{ secrets.DOCKERHUB_AUTH_TOKEN }}

# Step to set Docker tag based on the generated GitHub tag
- name: Set container tag
id: set_tag
run: |
# Extract the tag name from the full reference
IMAGE_TAG=$(echo "${{ github.ref }}" | sed 's|.*/||')
echo "IMAGE_TAG=$IMAGE_TAG" >> "$GITHUB_ENV"
- name: Build and push
uses: docker/build-push-action@v6
with:
Expand All @@ -64,4 +64,4 @@ jobs:
- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: 'trivy-results.sarif'
sarif_file: 'trivy-results.sarif'
2 changes: 1 addition & 1 deletion .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ ZSH_THEME="agnoster"
# Custom plugins may be added to $ZSH_CUSTOM/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
plugins=(git kube-ps1)
plugins=(git kube-ps1 kubectl terraform)

source $ZSH/oh-my-zsh.sh

Expand Down
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)*

- [Changelog](#changelog)
- [[unreleased]](#unreleased)
- [[2.0.0] - 2024-08-13](#200---2024-08-13)
- [[1.12.0] - 2024-08-06](#1120---2024-08-06)
- [[1.11.0] - 2024-08-05](#1110---2024-08-05)
- [[1.10.0] - 2024-08-05](#1100---2024-08-05)
- [[1.9.0] - 2024-06-11](#190---2024-06-11)
- [[1.8.2] - 2024-06-04](#182---2024-06-04)
- [[1.8.1] - 2024-06-04](#181---2024-06-04)
- [[1.8.0] - 2024-06-04](#180---2024-06-04)
- [[1.7.0] - 2024-05-29](#170---2024-05-29)
- [[1.6.0] - 2024-05-06](#160---2024-05-06)
- [[1.5.1] - 2024-05-01](#151---2024-05-01)
- [[1.5.0] - 2024-04-22](#150---2024-04-22)
- [[1.4.2] - 2024-04-19](#142---2024-04-19)
- [[1.4.1] - 2024-04-02](#141---2024-04-02)
- [[1.4.0] - 2024-04-02](#140---2024-04-02)
- [[1.3.0] - 2024-03-31](#130---2024-03-31)
- [[1.2.0] - 2024-03-31](#120---2024-03-31)
- [[1.1.0] - 2024-03-31](#110---2024-03-31)
- [[1.0.0] - 2024-03-29](#100---2024-03-29)

<!-- END doctoc generated TOC please keep comment here to allow auto update -->

# Changelog

All notable changes to this project will be documented in this file.
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN case $(uname -m) in \
# Core packages
RUN apk add --update --no-cache \
make ca-certificates zsh zsh-vcs jq zip shadow curl git vim bind-tools python3 py3-pip pipx kubectx \
openssl envsubst aws-cli=${AWSCLI_VERSION} docker-cli fzf
openssl envsubst aws-cli=${AWSCLI_VERSION} docker-cli fzf bash

# Rootless user
RUN groupadd --gid $USER_GID $USERNAME ;\
Expand Down

0 comments on commit a734309

Please sign in to comment.