[nc] op beta is backwards compatible

Signed-off-by: Nic Cheneweth <[email protected]>
ThoughtWorks-DPS · May 1, 2023 · d81a3a3 · d81a3a3
1 parent 7e9a8e7
commit d81a3a3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 28 deletions.
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
@@ -46,14 +46,8 @@ RUN apk add --no-cache \
     cmake -DLOCALE_PROFILE=OFF -D CMAKE_INSTALL_PREFIX:PATH=/usr . && \
     make && make install && \
     cd .. && rm -r musl-locales-master && \
-    sudo bash -c "echo https://downloads.1password.com/linux/alpinelinux/stable/ >> /etc/apk/repositories" && \
-    sudo bash -c "wget https://downloads.1password.com/linux/keys/alpinelinux/[email protected] -P /etc/apk/keys" && \
-    sudo apk update && sudo apk add --no-cache 1password-cli==${ONEPASSWORD_VERSION} && \
-    curl -SLO https://github.com/ThoughtWorks-DPS/opw/releases/latest/download/opw_Linux_x86_64.tar.gz && \
-    tar -xzf opw_Linux_x86_64.tar.gz && \
-    sudo mv opw /usr/local/bin/opw && \
     curl -L https://cache.agilebits.com/dist/1P/op2/pkg/v${ONEPASSWORD_BETA_VERSION}/op_linux_amd64_v${ONEPASSWORD_BETA_VERSION}.zip -o op.zip && \
-    unzip op.zip -o && sudo mv op /usr/local/bin/op-beta && \
+    unzip op.zip -o && sudo mv op /usr/local/bin/op && \
     rm op.zip && rm op.sig && \
     curl -L https://github.com/tellerops/teller/releases/download/v${TELLER_VERSION}/teller_${TELLER_VERSION}_Linux_x86_64.tar.gz --output teller_${TELLER_VERSION}_Linux_x86_64.tar.gz && \
     tar -xzf teller_${TELLER_VERSION}_Linux_x86_64.tar.gz && \

diff --git a/Dockerfile.slim b/Dockerfile.slim
@@ -28,18 +28,8 @@ RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci && \
             wget=1.21.3-1+b2 \
             unzip=6.0-28 \
             gnupg=2.2.40-1.1 && \
-    curl -sS https://downloads.1password.com/linux/keys/1password.asc | sudo gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg && \
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/$(dpkg --print-architecture) stable main" | sudo tee /etc/apt/sources.list.d/1password.list && \
-    sudo mkdir -p /etc/debsig/policies/AC2D62742012EA22/ && \
-    curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | sudo tee /etc/debsig/policies/AC2D62742012EA22/1password.pol && \
-    sudo mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22 && \
-    curl -sS https://downloads.1password.com/linux/keys/1password.asc | sudo gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg && \
-    sudo apt update && sudo apt install 1password-cli=${ONEPASSWORD_VERSION} && \
-    curl -SLO https://github.com/ThoughtWorks-DPS/opw/releases/latest/download/opw_Linux_x86_64.tar.gz && \
-    tar -xzf opw_Linux_x86_64.tar.gz && \
-    sudo mv opw /usr/local/bin/opw && \
     curl -L https://cache.agilebits.com/dist/1P/op2/pkg/v${ONEPASSWORD_BETA_VERSION}/op_linux_amd64_v${ONEPASSWORD_BETA_VERSION}.zip -o op.zip && \
-    unzip -o op.zip && sudo mv op /usr/local/bin/op-beta && \
+    unzip -o op.zip && sudo mv op /usr/local/bin/op && \
     rm op.zip && rm op.sig && \
     curl -L https://github.com/tellerops/teller/releases/download/v${TELLER_VERSION}/teller_${TELLER_VERSION}_Linux_x86_64.tar.gz --output teller_${TELLER_VERSION}_Linux_x86_64.tar.gz && \
     tar -xzf teller_${TELLER_VERSION}_Linux_x86_64.tar.gz && \

diff --git a/test/circleci_base_image_alpine.bats b/test/circleci_base_image_alpine.bats
@@ -27,11 +27,6 @@
 
 @test "1password version" {
   run bash -c "docker exec circleci-base-image-alpine-edge op --version"
-  [[ "${output}" =~ "2.17" ]]
-}
-
-@test "1password-beta version" {
-  run bash -c "docker exec circleci-base-image-alpine-edge op-beta --version"
   [[ "${output}" =~ "2.18" ]]
 }
 

diff --git a/test/circleci_base_image_slim.bats b/test/circleci_base_image_slim.bats
@@ -22,11 +22,6 @@
 
 @test "1password version" {
   run bash -c "docker exec circleci-base-image-slim-edge op --version"
-  [[ "${output}" =~ "2.17" ]]
-}
-
-@test "1password-beta version" {
-  run bash -c "docker exec circleci-base-image-slim-edge op-beta --version"
   [[ "${output}" =~ "2.18" ]]
 }